Merge "Fix a set of random warnings in frameworks/base/" into nyc-dev