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

Change-Id: I5d86d97e87296df9ff3dfd8bd2bc1e72839607da