Merge "Set -Xdoclint:none"
am: d49e55561a

* commit 'd49e55561aa139af1b7c5a2f448ab5c7d93272d6':
  Set -Xdoclint:none