Merge "Allow some bionic tests to compile with gcc." am: 85e94f076c
am: 00ec6d81fd

Change-Id: I1392a559ac1d035e293239cfa3c49e22f5cead40