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