Merge "Convert services to Android.bp" am: 5319777274 am: b8500d4771
am: 0688ef8668  -s ours

Change-Id: I40945253867f1f6c4e4fb43c41ac31d99b719fcc