Merge "matrix: camera HAL uses [^/]+/[0-9]+ instance." into pi-dev
am: 28efdacd2c

Change-Id: I713e894a40ca0e3e3e8c76df301194454db1353a