Merge "Add TEST_MAPPING for logcat package"