Merge "Create a shim apk which is malformed" into rvc-dev