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

Change-Id: I246cc96f1a146612267e49246cdad3840ca7fbb5