Merge "Revert "Remove use of deprecated gralloc APIs.""