Merge change Ia9788cd9

* changes:
  Cleaning up source.android.com files.