Merge "Build API stub with less number of source files" am: f0cc2aa46f
am: c86f52bc60

Change-Id: I8da1d306b487ef134f250a9d3723e6897f98d3f4