Clean up, no functionality change. Test: build Bug: 37752547 Change-Id: I7b6f368c0d0776f956a8b99353df7b23cbbc388d