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

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