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

Change-Id: I8b83b45a61ff58c6a487232c57f152233e6c5bcf