Cleaning up Android changes to work with v3

This was originally in the c++ namespace. A previous change moved into the C namespace so the function name was not mangled. We are reverting this change and updated DiscoBee's method to be in the c++ namespace.