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

Change-Id: Iff8206d308755bc63b7d0ab62fe1e5022258f0d4