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

Change-Id: Ib47dc3ece5a1a99fef4c4ffa0d9a594c00e479ab