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

Change-Id: Iabb2f8af7a80b70d5f01271230f3e1126a952638