Merge "Remove android/versioning.h support for versioner." into main