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

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