Merge "Compile NetworkStackApiStable as system_29"