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