Merge "Make soong_java_prebuilt.mk accept dex jars"