Fix merge derp: Emulated storage should be mounted in the child, not the
parent.

Change-Id: I7bb6e8db1a64de90e96783e07ff26932befe2742
Merge "Fix merge derp: Emulated storage should be mounted in the child, not the parent." into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into HEAD