Merge "Allowing product-specific fstab.postinstall"