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

Change-Id: Ib2a80b747bd1a0c4692a89d17bd96eeb03dbe46e