Merge "mkdir /data/misc/cameraserver for AVD's camera HALs" into nyc-dev