Merge "Revert "libstagefright: Remove direct access to gralloc""