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

Change-Id: I274b9c580e1e399e9575ba7de23925666f2e9276