camera wrapper: tweak stuff for apex/express

Change-Id: If9d805375c1bdb18ab6d115efaef93084de0fae1
Merge branch 'cm' into HEAD