Merge "Adding require_root for libfs_avb_device_test" am: b99ead6b24 am: 903f7bee11
am: 296cba0c5d

Change-Id: I3fda33848a2cf5f7f1ff5744fd04bf21ab6130b8