Merge "Clean up libutils Android.mk"