Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master