Merge "Update apidiff source files to use new api location." into pi-dev-plus-aosp