Merge "Compile API stubs to dex"
am: 252f328bc9

Change-Id: I7d9d0207b94cd65de74084fb38054e0ffdc89d81