Merge "Add TEST_MAPPING for androidfw to add presubmit tests."