Camera : Use proper device identifying mechanism

Change-Id: Ie6af1c9936f7470a0a1a3b5f58f00474bb7b1735