Merge "Fix java.lang.NoSuchFieldError on R$styleable" into qt-dev