Merge "Push cameraserver downstream from base_system.mk."
am: 8f3d20ffbf

Change-Id: I2248a1a473094c50859baf048063c3105eeb1173