Merge changes I7ad0d7c2,Iccc7a5dd

* changes:
  gralloc: fix numFds for framebuffer handles
  gralloc: make register framebuffer no-op