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

Change-Id: I0b818e500c50a3a83c2cb00665e06fa5d69bcb3f