Merge "ContextHub: Android.mk -> Android.bp"