Merge "Adding require_root for libfs_avb_device_test"
am: b99ead6b24

Change-Id: Ic8cf2e479ef312dea1ff8964ea99de9a0b0f75f7