Merge "Camera test apps: Remove unneeded include" into nyc-dev