am 379e2f59: Clean up unnecessary files after build-only. Bug: 9482191

* commit '379e2f5996b38d9f67b9c334c232cb315a5390ad':
  Clean up unnecessary files after build-only. Bug: 9482191