Merge changes I914fa057,I89ad4e2e

* changes:
  libbinder: emphasize kernel state objs
  libbinder: alternative in calling guard error