Merge "Fix style nits in adb's Android.mk."
am: 0e6090dc2b

Change-Id: I6a2ff9ba9967e16917397141ced113d5a884d826