Merge "Clean up GraphicBuffer flatten and unflatten methods"