Merge "Support mounting same mount points with different fstab config"
am: 82b8e518e3

Change-Id: I30871a498ee7c1438f1a6da60fa2eb2fcba24111