Merge "Fix java.lang.NoSuchFieldError on R$styleable" into qt-dev am: 508601ae7b
am: bc5312f8d7

Change-Id: I442278bbf7c77169ec0e14e4dc3068e47169674f