Merge "Merge "Update TEST_MAPPING to include CtsMediaPlayerTestCases" am: f399647e7d am: 6677547ab5 am: a4c62778a8 am: 584bd68911"