change 2115 wasn't merged properly into master. this fixes that.

Merge change 2115 into donut

* changes:
  bring the native_handle stuff back from master_gl

Conflicts:

	libs/binder/Parcel.cpp
2 files changed