tree e7a57f7c0a4a64eda0e7f704f0c20f3b3749ba1b
parent bf480fe178b314e0734c292118f71f0c52514082
parent e8d1f48260f88f839f52e5e3df628e9bd164134a
author Douglas Yung <douglas.yung@sony.com> 1566423743 -0700
committer android-build-merger <android-build-merger@google.com> 1566423743 -0700

Fixup files added in r362636 to build with gcc 5.4. NFCI am: ec0922ee67 am: ebc5cbee98 am: a0b69ae9d8
am: e8d1f48260

Change-Id: I42ae2b46af9c803547ba1071f3998af3429097e9