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

Change-Id: I1dc35e30d0eb333a96a0e6b045ec7ebe43fb9a5b