am: 239e4558 * commit '239e4558': Re-introduce camera_device type Change-Id: I909c111793ae0da592c087fb9166e520b7f3ef5b