[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 skip reason: Change-Id I4490aa0a61fa71f830feb6a46dffd8d20fccfc66 with SHA-1 98c71228 is in history
Change-Id: Ie745342896635768f56e2806b64d4e3197328d6e