Android N Preview 2
Merge changes Id2e4ff88,I384f4723

* changes:
  Use empty list initializers to construct all zero-initialized variables.
  Fix up P_warnings_deprecated now that header has changed.