Merge "Generate TEST_MAPPING for test modules in .bp file"