Merge "Fix style nits in adb's Android.mk." am: 30b7f59efc
am: 86698112b9

Change-Id: I1ebbd9a008f5d0cd0812d85802888a952ea77a1b