Push cameraserver downstream from base_system.mk.
am: 75add9d313

Change-Id: I486c53118a538a0995b127cb07770888ffed9b03