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

Change-Id: I005ad7423530804a6cf13d0c5e41562c143e0f42