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

Change-Id: I93c10835f80d9330c2d7dfd02db97df34005e7b6