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

Change-Id: Id59a9457ba34bce71a2bba579ac9b7cf452699da