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

Change-Id: Iddb682ebf831279c2f20103ca67e2568cc579762