Merge "Clean up APIs before declaring API 28." into pi-dev