Merge "Handle shared libraries for split apks." into oc-dev