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

Change-Id: I26f2b3e8f24090ea8f06ebeae2d986cc0606ac56