Use newly added ms2 APIs

Merged Sylvain Berfini requested to merge feature/store_android_classes_in_struct into release/5.2

Merge request reports