Merge pull request #2 from TamsuiCM11/cm-11.0

base merge
enable wrapper
enable wrapper
Merge pull request #21 from rebelos/cm-11.0

camera: fix some derps