am bd80a12c: resolved conflicts for merge of 9240f16d to honeycomb-plus-aosp

* commit 'bd80a12cba480a0dbb2e9073f35c758d8b396b94':
  StrictMode: class instance limits (track object "leaks")