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

Change-Id: I40395c139169903bcd66485f9d13b024db80b45c