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

Change-Id: Idc202e04a3455fd25a7444c2110e0cf83c06fd0b