camera build fix
commits taken from android_motorola_omap4-common/commit/1f3cfa15170f031c31e828512a9a1147429f25b0