Merge "Remove unused Android.mk under contexthub/firmware/variant" into main