Merge "stagefright: add TEST_MAPPING"