Track CM's Gallery2 and Camera

Attempt to fix compile problems