Merge "libbootloader_message: use different fstab paths for normal/recovery boot" am: 5f98326c1e
am: 85882b0779

Change-Id: Ie7f75589e4ec7a3da4bc8cb31f0630837cbea4f4