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

* commit '9358bd39dc8829ef8413294da70d44cd928ca878':
  Fixes for StrictMode instance count checking.