Merge changes from topic "aapt2-attr" into qt-dev
am: ac919fcfcc

Change-Id: I97cffd87de2b8b9167af79fc07c83dfdf00dd10e