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

Change-Id: I893d5237d04d2a207da2a57e62f2ea890f57fdf7