Merge "Move GraphicBuffer back into libandroid_runtime."