am a5ca3425: Merge change 2017 into donut

Merge commit 'a5ca3425f9cbb930dc62559893590432ed29c961'

* commit 'a5ca3425f9cbb930dc62559893590432ed29c961':
  Increment BatteryStatsImpl's VERSION.
tree: dee56e6e6d25c1cdafbc8707df8043e6e26307ee
  1. awt/
  2. camera/
  3. cmds/
  4. im/
  5. include/
  6. libs/
  7. opengl/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE