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

Change-Id: Ic272be5c1ac460d5bda8373b8790829b43ef8257