Merge "Make soong_java_prebuilt.mk accept dex jars"
am: d739bef96d

Change-Id: Ie9909adf61560f82d9a7c7482c2769fe4d81baee