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

Change-Id: Ibd593a3530053d011fad17a705cebb30b164e47d