Merge changes Iadec9904,I3131563f

* changes:
  Update generated files for Android
  Android: define HAVE_GETMNTINFO on macOS