Merge "Move bionic-unit-tests-static to libclang_rt.builtins"
am: 96c21e43b4

Change-Id: I79c2c06cd179d6cb1fa63e69735ae4bff0559145