Rework java structure
Fix @file
Merge remote-tracking branch 'origin/android-rework'
[DEV] update Android interface