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

Change-Id: I41a44a2684fa322039d3979a663aa4b4e0ef73d7