am 10e2d222: am d463f6e9: am 34959e0b: Merge "Clean up libc/Android.mk a bit after the crtbrand changes."

* commit '10e2d222ce3db0c310c00cd1a5cffdd2223b5dfe':
  Clean up libc/Android.mk a bit after the crtbrand changes.