Merge "Clean up libc/Android.mk a bit after the crtbrand changes."