tree e7a57f7c0a4a64eda0e7f704f0c20f3b3749ba1b
parent c67a29292335cce7eeb24fd28c31067e583b02e7
parent a0b69ae9d8f82251daf7c5844a8b1537265abbdb
author Douglas Yung <douglas.yung@sony.com> 1566421875 -0700
committer android-build-merger <android-build-merger@google.com> 1566421875 -0700

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

Change-Id: I40395c139169903bcd66485f9d13b024db80b45c