Make storage dirs remount fork() safe am: 6b12257702 am: d0d09131fd

Change-Id: I2b9dd22888ae19ad8a0faa08f0d1ca938a20d0cf