am 94f14aec: Merge "More StrictMode work, handling violations in ActivityManagerService." into gingerbread

Merge commit '94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2' into gingerbread-plus-aosp

* commit '94f14aeca9e6c6d07b39a7f708eacadcfeb6fbd2':
  More StrictMode work, handling violations in ActivityManagerService.