[automerger skipped] Merge "Allow the user to explicitly set the java...

[automerger skipped] Merge "Allow the user to explicitly set the java Uncompress_dex property." am: 38b2a860 am: 541d1002 -s ours am: a0e73508 -s ours am: 70da296a -s ours am: 3c6e58ee -s ours

am skip reason: Change-Id I4490aa0a61fa71f830feb6a46dffd8d20fccfc66 with SHA-1 98c71228 is in history

Change-Id: I9c759120f95cc956f3127e48f2e902e3864308b1