Merge "Push cameraserver downstream from base_system.mk." into pi-dev-plus-aosp
am: ab4214fd2a

Change-Id: Ib32ca384c6d60e249a5cd76ac33e5997e7754d06