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

Change-Id: I4d8a20aa51bec99027579da0c1a80063d597d695