Merge "target_config: add art-test-javac target" am: 07f8d8619f
am: 07a6f47577

Change-Id: I93794e8b869423f3aac54baa83c7571f2fc0559f