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

Change-Id: I0978b92dfb8eb83bc916dba33282aa5dec841f28