Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev