Merge "Camera: override external facing for API1 client" into nyc-dev
am: c3c06c4

* commit 'c3c06c4fe329d07bd7d442206bc9eb63e92bf5bd':
  Camera: override external facing for API1 client

Change-Id: I691ef00e363043296fa294b99b029274626a6da9