4.x
android: gradle-based package and samples
Merge pull request #16222 from hannesa2:AndroidMoveVersionInfo