Merge "Convert services to Android.bp" am: 5319777274
am: b8500d4771

Change-Id: Idcfeb088fa73e679d18de2ce2dc2ba58cdc78af7