am 5ff9fd62: Merge "Update the API 16 files used by the SDK." into jb-dev

* commit '5ff9fd62fb0eca575c55c3dd3d0484396f42d4e3':
  Update the API 16 files used by the SDK.