Merge commit '5eb49e0f' into m

Conflicts:
	core/java/com/android/internal/os/BatteryStatsImpl.java

Change-Id: Idc9c84c2ca7dec2540ceccead7927fddb912ff12
tree: 3f4ae29dd568b69be2cb8dc2fc97ea9044960543
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE