more black

Change-Id: Ib039a8fe3fa4168630675461890a118196a6b713
Merge "more black" into android-4.4