Merge "Fix new NewApi lint warnings" into stage-aosp-master