refactor media gate src folders for gradle build
Merge branch 'release/2.1.2'