Merged with Android L branch.
Fixed ae\aw lock (don't use cameraParameters!)
Fixes som issues in HALv3
Merge branch 'master' into panosweep

Conflicts:
	src/com/almalence/plugins/capture/panoramaaugmented/AugmentedPanoramaEngine.java
	src/com/almalence/plugins/capture/panoramaaugmented/PanoramaAugmentedCapturePlugin.java
Notes:
	Panorama still has issues