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

Change-Id: I336b6a140d548ffea06061b1e149132becfa5dc3