Merge "Allowing product-specific fstab.postinstall" am: 66920d2072
am: 43145ee304

Change-Id: I0639b020ee967009f8006fb4e5e1240703be3650