Merge "AAPT: faketouch feature implied if no touchscreen feature requested." into nyc-mr1-dev am: 9ff0eed7 am: 8cbd88ba Change-Id: I2e7e7737e3d0d9cd3e7a6717bf7dc20708f4581a