Merge "Fix build of mksdcard with Gradle." into idea133