Merge "base: Convert libs/services/Android.mk into a blueprint"