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

Change-Id: I1ac6443246ba4641d34b24b16539d296f09df38d