Merge "AAPT: faketouch feature implied if no touchscreen feature requested." into nyc-mr1-dev