Push cameraserver downstream from base_system.mk.
am: 9d717edf6c

Change-Id: I77505978dd3cfe04cd59acd2739c4d1a5bf14411