Various changes

Change-Id: I1472cfdd0653dc65d6851f30f12158f34e69dc87
USE_CAMERA_STUB: must be defined in device
Merge pull request #5 from mifl/jellybean

Various changes