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

* commit 'afe3d2718b0d87ad7ebc6299c2aaa44a5178ae9d':
  Clean up libutils Android.mk