tree e7a57f7c0a4a64eda0e7f704f0c20f3b3749ba1b
parent 98ecb31b4eae0b837f2e71f47752b829963a3c67
parent ebc5cbee985680d63dd8c3ec31497be537dbdb5f
author Douglas Yung <douglas.yung@sony.com> 1566420788 -0700
committer android-build-merger <android-build-merger@google.com> 1566420788 -0700

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

Change-Id: Iabb2f8af7a80b70d5f01271230f3e1126a952638