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

Change-Id: I589afb12062914cc3da9ff8f7c8dd43014ac6ce9