Merge "Don't unmount /storage for early native processes" am: ee9554b2d9
am: b5acb5bfba

Change-Id: I2c3b48550a64486214835fbcfa1879cc2cbddb2b