Merge "Return jobject when getting android Java Surface" into oc-dev