Merge "fstab: allow mounting other slot" am: 9a7a50aea0
am: 4e32cb9f7a

Change-Id: I43a2e2b7cf6efae837cd6a1f8fadf40cd81fc66c