DEXOPT_FORCE may be passed for primary apk as well. am: 2ab108c5be am: b77cb8b653
am: 64f3d11dd7

Change-Id: Ibce43134609ce8e188238f0666c05c7b174c3be4