Merge "Reference ScopedUtfChar header correctly." into stage-aosp-master
am: 3f378940c2

Change-Id: Iecb2b1b6ba647b0fe65c538f0a1cdb957e6dbb3e