am 48184679: am c12b0da0: am e0b23da8: Merge "Tweak sanity check." into gingerbread

Merge commit '48184679e8caa9d4c637187cd94f59d38929ac7a' into dalvik-dev

* commit '48184679e8caa9d4c637187cd94f59d38929ac7a':
  Tweak sanity check.