Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"