Merge "API renaming asked by API Council" into stage-aosp-master