Fix leaks in mount_one() am: 8c3acbce96 am: ae787e2234
am: c8c7bf855c

Change-Id: I16c4509fcbc89975421ad4838daf84ecf4c7f0e7