AI 146872: am: CL 146870 am: CL 146865 Final pass on stubber: properly filter fields and methods.
  Original author: raphael
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146872
7 files changed