Merge "LoadedApk: Avoid unnecessary work when mIncludeCode == false. am: 8995b00ce8 am: 788a8a87ef" into nyc-mr1-dev-plus-aosp
am: 883c25a510

* commit '883c25a510b62c33c1e95f3195a2566716c4981b':

Change-Id: Iac9c4d7bbfe0820253b33edefd7c0e640cc82488