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

Change-Id: I67de7ba7cca3b52666299bb3dffe5bf27b5b31f0