Merge "Handle load from APK correctly for shared relro" into mnc-dev