Android 6.0.1 release 25 (MTC19T)
Compile against the devtools annotations to fix docs build. [DO NOT MERGE] am: 83533c5f87 am: 5e5b10e86e am: 508d76f134  -s ours
am: a3d8dc6de9

* commit 'a3d8dc6de9b2383212dfb7b0de45112ae74d7e92':
  Compile against the devtools annotations to fix docs build. [DO NOT MERGE]