frameworks/base: code cleanup

Change-Id: I350ad083ea94a04aac31e2ba967d28d4e38c385f