Fix the logical OR computation in .mk file. Otherwise, when both
experiments are on, the output of $(filter... will be two 'yes',
which will cause missing library issue.

Change-Id: I53c44e925dc9ea77c7467217c20e4f1bc7e20fc3