Merge "Fix static dex2oat  build"
am: 4764d4e253

* commit '4764d4e253aaea1595bbe1f5aaa8677ea9319b79':
  Fix static dex2oat  build