Merge "Fix static dex2oat  build" am: 4764d4e253
am: f006a4bc9d

* commit 'f006a4bc9d112af0f90bf09d194da2bf681af806':
  Fix static dex2oat  build