Merge "Add camera APIs to light grey." into pi-dev
am: 6c26c953e4

Change-Id: Iecf617354c98c8336920271fb7a0abccaf3a32a7