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

Change-Id: I9875a9075eacc1e0e556adee3f9411d91e44cd55