Merge "Use soong_java_prebuilt.mk to export soong jars to java" am: 11d1c9b02f
am: 5d97be5117

Change-Id: Ic4ed186b5ec3bb20bda8d2642057dd490c1ccf30