Merge "Revert "[Thread] add Android.bp for Thread flags"" into main