Android tests: skip txt files in box folder
Buildserver auto merge