am 7204528e: am 9358bd39: Merge "Fixes for StrictMode instance count checking." into honeycomb

* commit '7204528e71145e34bedd6cfb13110eb872d8a968':
  Fixes for StrictMode instance count checking.