Fix up some derpage: Camera + Keystore

Change-Id: I83f0035a0a3951f012cfac576f7c2b802f245beb