Merge "return an error code with gralloc buffer allocation failures"