Merge "Fix style nits in adb's Android.mk."