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