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

Change-Id: Ifea68caa592bd22d36ab392ca8e3016c5b46e9b7