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