recovery:  restore original recovery file structure
camera: fixups to build with lollipop

Change-Id: I8ee115a6f7693fef6f63c47cd8e2595134a7b656