Merge "base: Convert libs/services/Android.mk into a blueprint" am: f0561142f3
am: 8f919b8c5b

Change-Id: Ic8e741ec39fc83cdd64ce313d5d66fdbaa1e7ebc