am 3251f2aa: am 3383b141: am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"

* commit '3251f2aab75c8c905cc59b428d99812b5575ebdb':
  Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files