Merge "Use bitset api in InputClassifier" into qt-dev am: 598673fc55
am: b293bbd6b4

Change-Id: I90e55c342308a3d0a23ec40d6578983590e57fd7