[automerger skipped] Merge "Fix handling optimize.enabled from java_defaults"...
[automerger skipped] Merge "Fix handling optimize.enabled from java_defaults" into qt-dev am: 687fd94d -s ours
am: 9901de43 -s ours
am skip reason: change_id Ib8e3a0ab0bd489d70ed07f626082aeae31c45e7c with SHA1 2057f821 is in history
Change-Id: I38e7917bf6649748640f9f6695f1841f98b3a19b