AI 144240: Added a test for a bug reported externally (via android-platform).
  Through separate compilation and inheritance, it's possible for a
  class to have static and instance fields with the same name.  This
  test verifies that we throw an IncompatibleClassChangeError when this
  occurs.  (The test currently fails.)
  Also: my change 126993-p9 made "--dev" visible to the "helper" scripts,
  but only the "local" one accepts it.  Fixed the other two to accept
  and ignore it.
  BUG=1752800

Automated import of CL 144240
8 files changed