Merge "Free native_handle created using makeFromAidl" into tm-dev