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

Change-Id: Ied25cc96446edb7d09c5283d5a981cfa59b041f5