Update this to AOSP KK
Revert "Delete CameraWrapper.cpp"

This reverts commit 77bc093cdb6ff3f041ae47b79bc2494a3ad61495.
Revert "Delete Android.mk"

This reverts commit bcdbab12ed025a9822ea6edd21b73fe51e277636.