am 99c1009a: am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev

* commit '99c1009a897834e8282a59c0dda8f29dd33234e4':
  dex2oat should show something friendlier in Settings -> Battery