Merge "libcore: Address misc minor issues identified by FindBugs"