Merge "Don't build bionic-unit-tests-static with libcrt_builtins" am: d495e0b777
am: 9f5d48c97a

Change-Id: Ibdf77f3f32621d34b0b0cdbdd30a361d9d54efe4