Merge change 7494

* changes:
  remove libagl's dependency on gralloc_priv.h