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

Change-Id: Id75dded5439bf3ea2fddb6e08517ab7be7a7aa20