camera: fixups to build with lollipop

Change-Id: I8ee115a6f7693fef6f63c47cd8e2595134a7b656
camera: fix to build against cm framework

Change-Id: Icb8a09d285669ac889c1d5d18324fba9baa1dcc9