Merge "Build API stub with less number of source files" am: e4ec72bee6
am: f0bc40ffae

Change-Id: I56a8be4ecfa0913025ace704a861bc3ef1cb264b