Bring in mount tools

Change-Id: I5a04671b3f15ab07e6c95cd903dc9f707aa3322f