Merge "Revert "Convert cld80211-lib/Android.mk to Android.bp""