Merge "Remove the framework dependency on networkstack-aidl-framework."