am 026cba6c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

* commit '026cba6c66677b6eb8ad6ac260dfd1bece07362d':
  Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
  Fix logspam when battery sysfs file not available.