frameworks/base: code cleanup

Change-Id: I499cfc3cd4e8d6b8f8a13c55f8e87cd887635e2f