Merge "Fix static dex2oat  build"