am 6d587381: am afe3d271: Merge "Clean up libutils Android.mk"

* commit '6d587381de1b2d807b6e7917560d9bac43a46ba0':
  Clean up libutils Android.mk