Merge change I3cd199f9

* changes:
  Work-in-progress snapshot of the source.android.com (formerly PDK) site refresh.