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

Change-Id: I37b3adfe21654627c9ded74d16049a1cd627e56a