Merge "Add an explicit reason for the compilation of shared apks" into oc-mr1-dev
am: d78d269650

Change-Id: I18243e9c77c921d5b860ccfe4bb021e21e8bb5e7