Merge "add libandroidfw_tests back to TEST_MAPPING"