Merge "Update the API 16 files used by the SDK." into jb-dev