Merge "Extend isModule check for apk-in-apex" into rvc-dev