Merge "TEST_MAPPING: Consolidate libstagefright's postmapping entries" into main