camera: update for lollipop

Change-Id: Ibb7892b164fc1dbe4d938a5d2fda86f19f2f6ed3