Frameworks/base: Code Cleanup

Change-Id: Id48f31485cd5ff0594250072c9b1a6b8e05191cb