Merge changes Ib35bb121,I9903fc50

* changes:
  Ensure all ojluni Android-changed comments occur in line comments.
  Further canonicalized Android-changed comments