Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  Camera: update video stabilization API doc.

Change-Id: Ied4743e0a67365d3ab2c7e208ce5990d74eccee4