Merge "Unzip apk in $(genDir) instead of inside source tree"