Fix up the CPU flag filtering to allow 'like' op work

Bug: 890261
Change-Id: I861d5a74f5912f70d37cb1fe50f05165633ef977
Merge "Fix up the CPU flag filtering to allow 'like' op work" into develop