Merge "order dependendencies in AconfigFlags.bp" into main