Merge "Add Android.soong.mk to support lib/profile/..."