Android N MR2 Preview 2
Merge changes Id6d23112,I474dd0c0

* changes:
  vndk-def: Don't remove all deps in normalization.
  vndk-def: Add symbol usages in dependency dumps.