Merge "Move NetworkStack AIDLs to NetworkStack folder"