Merge "Revist C2HandleGralloc::WrapNativeHandle"