Merge "Add camera APIs to light grey." into pi-dev
am: 9ed0da42b3

Change-Id: I985d6d64b670b4f56ad684c94bc83b21b7bd4185