Merge "Add require_root to adbd_test and libpackagelistparser_test" am: 03ba5b9dfb am: 6d5176a650 am: 6f3462a2e8
am: 7473404807

Change-Id: Id3fe5c7b205c6395a3923bcfed1427e3a6f56948