Merge "2nd attempt to remove legacy-test from TARGET_DEFAULT_JAVA_LIBRARIES" am: 6cf9da761a am: 4e5d1b0624
am: 750dfa7590

Change-Id: If622342a0dd0ee21213645d576ccc2cd2b587bae