Android N Preview 2
Merge "Encoder: Fixed adaptive intra refresh."
am: cb9903952b

* commit 'cb9903952be53e96567162958e4c9f1eac07d878':
  Encoder: Fixed adaptive intra refresh.