Track 2 more cm projects

This will fix the build for qcom devices after some recent changes.

Change-Id: Ide5c88a8c504495ad9fdeb8d0d40dfdcea0005b3
Signed-off-by: Dirk Rettschlag <dirk.rettschlag@gmail.com>
Merge remote-tracking branch 'upstream/jb-mr2' into jb-mr2