Merge "Remove extranous reading of fstab in BuilderTest::block_device_info" am: 47a4082f88
am: 9691e45085

Change-Id: Idd7bdce44b4e560bb22a163bb464f641f8f56315