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

Change-Id: Id22158da15aeedd3b6828c5f2becfbdf443acdd6