Fix searching for multiple CPU flags.

Bug: 988848
Change-Id: I3c6f6646801e64e283f8be2205ac0d7f4367f8a4
Merge "Fix searching for multiple CPU flags." into develop