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

* commit '0aa0ce39b2195cbbfa792e802b8d65c6de9099e8':

Change-Id: Id150ce4a6371838ac4ee8fbeed4a047b3f5ee2d0