Remove api_dir property

The api_dir property is removed, and the api dir path for aidl_interface
is fixed to aidl_api/{module_name}. According to this rule, all api dirs
are moved to aidl_api/{module_name}.

Bug: 113134692
Test: m -j
Change-Id: I0feb7b6c6b2ee8620e0e1b7c07c409a294e3a9d2
Merged-In: I0feb7b6c6b2ee8620e0e1b7c07c409a294e3a9d2
(cherry picked from commit d1dcab928d38d25736ffd7fa942c33d3757daac9)

106 files changed, 0 insertions, 2 deletions

diff --git a/common/networkstackclient/Android.bp b/common/networkstackclient/Android.bp
index 9c9ae21..d41b470 100644
--- a/common/networkstackclient/Android.bp
+++ b/common/networkstackclient/Android.bp
@@ -31,7 +31,6 @@ aidl_interface {
             enabled: false,
         },
     },
-    api_dir: "aidl/ipmemorystore",
     versions: [
         "1",
         "2",
@@ -69,7 +68,6 @@ aidl_interface {
             enabled: false,
         },
     },
-    api_dir: "aidl/networkstack",
     imports: ["ipmemorystore-aidl-interfaces"],
     versions: [
         "1",
diff --git a/common/networkstackclient/aidl/ipmemorystore/1/android/net/IIpMemoryStore.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/IIpMemoryStore.aidl
index a8cbab2..a8cbab2 100644
--- a/common/networkstackclient/aidl/ipmemorystore/1/android/net/IIpMemoryStore.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/IIpMemoryStore.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/1/android/net/IIpMemoryStoreCallbacks.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/IIpMemoryStoreCallbacks.aidl
index cf02c26..cf02c26 100644
--- a/common/networkstackclient/aidl/ipmemorystore/1/android/net/IIpMemoryStoreCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/IIpMemoryStoreCallbacks.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/Blob.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/Blob.aidl
index 291dbef..291dbef 100644
--- a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/Blob.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/Blob.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
index 52f40d4..52f40d4 100644
--- a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
index 7853514..7853514 100644
--- a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
index 3dd2ae6..3dd2ae6 100644
--- a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
index 46d4ecb..46d4ecb 100644
--- a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnStatusListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/IOnStatusListener.aidl
index 54e654b..54e654b 100644
--- a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/IOnStatusListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/IOnStatusListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
index 9531ea3..9531ea3 100644
--- a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
index 414272b..414272b 100644
--- a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/StatusParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/StatusParcelable.aidl
index 92c6779..92c6779 100644
--- a/common/networkstackclient/aidl/ipmemorystore/1/android/net/ipmemorystore/StatusParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/1/android/net/ipmemorystore/StatusParcelable.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/2/android/net/IIpMemoryStore.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/IIpMemoryStore.aidl
index a8cbab2..a8cbab2 100644
--- a/common/networkstackclient/aidl/ipmemorystore/2/android/net/IIpMemoryStore.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/IIpMemoryStore.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/2/android/net/IIpMemoryStoreCallbacks.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/IIpMemoryStoreCallbacks.aidl
index cf02c26..cf02c26 100644
--- a/common/networkstackclient/aidl/ipmemorystore/2/android/net/IIpMemoryStoreCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/IIpMemoryStoreCallbacks.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/Blob.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/Blob.aidl
index 291dbef..291dbef 100644
--- a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/Blob.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/Blob.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
index 52f40d4..52f40d4 100644
--- a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
index 7853514..7853514 100644
--- a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
index 3dd2ae6..3dd2ae6 100644
--- a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
index 46d4ecb..46d4ecb 100644
--- a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnStatusListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/IOnStatusListener.aidl
index 54e654b..54e654b 100644
--- a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/IOnStatusListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/IOnStatusListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/NetworkAttributesParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
index 9531ea3..9531ea3 100644
--- a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
index 414272b..414272b 100644
--- a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/StatusParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/StatusParcelable.aidl
index 92c6779..92c6779 100644
--- a/common/networkstackclient/aidl/ipmemorystore/2/android/net/ipmemorystore/StatusParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/2/android/net/ipmemorystore/StatusParcelable.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/3/android/net/IIpMemoryStore.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/IIpMemoryStore.aidl
index 30893b2..30893b2 100644
--- a/common/networkstackclient/aidl/ipmemorystore/3/android/net/IIpMemoryStore.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/IIpMemoryStore.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/3/android/net/IIpMemoryStoreCallbacks.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/IIpMemoryStoreCallbacks.aidl
index 535ae2c..535ae2c 100644
--- a/common/networkstackclient/aidl/ipmemorystore/3/android/net/IIpMemoryStoreCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/IIpMemoryStoreCallbacks.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/Blob.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/Blob.aidl
index 6d2dc0c..6d2dc0c 100644
--- a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/Blob.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/Blob.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
index 48c1fb8..48c1fb8 100644
--- a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
index aebc724..aebc724 100644
--- a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
index b66db5a..b66db5a 100644
--- a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
index e9f2db4..e9f2db4 100644
--- a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnStatusListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/IOnStatusListener.aidl
index 49172ce..49172ce 100644
--- a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/IOnStatusListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/IOnStatusListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
index 188db20..188db20 100644
--- a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
index 7a2ed48..7a2ed48 100644
--- a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/StatusParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/StatusParcelable.aidl
index d9b0678..d9b0678 100644
--- a/common/networkstackclient/aidl/ipmemorystore/3/android/net/ipmemorystore/StatusParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/3/android/net/ipmemorystore/StatusParcelable.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/.hash b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/.hash
index d24f0f7..d24f0f7 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/.hash
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/.hash
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/android/net/IIpMemoryStore.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/IIpMemoryStore.aidl
index 1e688d0..1e688d0 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/android/net/IIpMemoryStore.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/IIpMemoryStore.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/android/net/IIpMemoryStoreCallbacks.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/IIpMemoryStoreCallbacks.aidl
index cf02c26..cf02c26 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/android/net/IIpMemoryStoreCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/IIpMemoryStoreCallbacks.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/Blob.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/Blob.aidl
index 291dbef..291dbef 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/Blob.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/Blob.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
index 52f40d4..52f40d4 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/IOnBlobRetrievedListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
index 7853514..7853514 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/IOnL2KeyResponseListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
index 3dd2ae6..3dd2ae6 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/IOnNetworkAttributesRetrievedListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
index 46d4ecb..46d4ecb 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/IOnSameL3NetworkResponseListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/IOnStatusListener.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/IOnStatusListener.aidl
index 54e654b..54e654b 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/IOnStatusListener.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/IOnStatusListener.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/NetworkAttributesParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
index 9531ea3..9531ea3 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/NetworkAttributesParcelable.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
index 414272b..414272b 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/SameL3NetworkResponseParcelable.aidl
diff --git a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/StatusParcelable.aidl b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/StatusParcelable.aidl
index 92c6779..92c6779 100644
--- a/common/networkstackclient/aidl/ipmemorystore/4/android/net/ipmemorystore/StatusParcelable.aidl
+++ b/common/networkstackclient/aidl_api/ipmemorystore-aidl-interfaces/4/android/net/ipmemorystore/StatusParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/DhcpResultsParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/DhcpResultsParcelable.aidl
index 92b5345..92b5345 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/DhcpResultsParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/DhcpResultsParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/INetworkMonitor.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/INetworkMonitor.aidl
index b19f522..b19f522 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/INetworkMonitor.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/INetworkMonitor.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/INetworkMonitorCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/INetworkMonitorCallbacks.aidl
index ee9871d..ee9871d 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/INetworkMonitorCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/INetworkMonitorCallbacks.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/INetworkStackConnector.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/INetworkStackConnector.aidl
index 7da11e4..7da11e4 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/INetworkStackConnector.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/INetworkStackConnector.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/INetworkStackStatusCallback.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/INetworkStackStatusCallback.aidl
index f6ca6f7..f6ca6f7 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/INetworkStackStatusCallback.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/INetworkStackStatusCallback.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/InitialConfigurationParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/InitialConfigurationParcelable.aidl
index c80a787..c80a787 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/InitialConfigurationParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/InitialConfigurationParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/PrivateDnsConfigParcel.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/PrivateDnsConfigParcel.aidl
index 2de790b..2de790b 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/PrivateDnsConfigParcel.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/PrivateDnsConfigParcel.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/ProvisioningConfigurationParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/ProvisioningConfigurationParcelable.aidl
index 3a6c304..3a6c304 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/ProvisioningConfigurationParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/ProvisioningConfigurationParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/TcpKeepalivePacketDataParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/TcpKeepalivePacketDataParcelable.aidl
index e121c06..e121c06 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/TcpKeepalivePacketDataParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/TcpKeepalivePacketDataParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/dhcp/DhcpServingParamsParcel.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/dhcp/DhcpServingParamsParcel.aidl
index 67193ae..67193ae 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/dhcp/DhcpServingParamsParcel.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/dhcp/DhcpServingParamsParcel.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/dhcp/IDhcpServer.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/dhcp/IDhcpServer.aidl
index 9143158..9143158 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/dhcp/IDhcpServer.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/dhcp/IDhcpServer.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/dhcp/IDhcpServerCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/dhcp/IDhcpServerCallbacks.aidl
index dcc4489..dcc4489 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/dhcp/IDhcpServerCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/dhcp/IDhcpServerCallbacks.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/ip/IIpClient.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/ip/IIpClient.aidl
index 95a1574..95a1574 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/ip/IIpClient.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/ip/IIpClient.aidl
diff --git a/common/networkstackclient/aidl/networkstack/1/android/net/ip/IIpClientCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/ip/IIpClientCallbacks.aidl
index d6bc808..d6bc808 100644
--- a/common/networkstackclient/aidl/networkstack/1/android/net/ip/IIpClientCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/1/android/net/ip/IIpClientCallbacks.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/DhcpResultsParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/DhcpResultsParcelable.aidl
index 31891de..31891de 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/DhcpResultsParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/DhcpResultsParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/INetworkMonitor.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/INetworkMonitor.aidl
index 029968b..029968b 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/INetworkMonitor.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/INetworkMonitor.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/INetworkMonitorCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/INetworkMonitorCallbacks.aidl
index ee9871d..ee9871d 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/INetworkMonitorCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/INetworkMonitorCallbacks.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/INetworkStackConnector.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/INetworkStackConnector.aidl
index 7da11e4..7da11e4 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/INetworkStackConnector.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/INetworkStackConnector.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/INetworkStackStatusCallback.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/INetworkStackStatusCallback.aidl
index f6ca6f7..f6ca6f7 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/INetworkStackStatusCallback.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/INetworkStackStatusCallback.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/InitialConfigurationParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/InitialConfigurationParcelable.aidl
index c80a787..c80a787 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/InitialConfigurationParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/InitialConfigurationParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/NattKeepalivePacketDataParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/NattKeepalivePacketDataParcelable.aidl
index 65de883..65de883 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/NattKeepalivePacketDataParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/NattKeepalivePacketDataParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/PrivateDnsConfigParcel.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/PrivateDnsConfigParcel.aidl
index 2de790b..2de790b 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/PrivateDnsConfigParcel.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/PrivateDnsConfigParcel.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/ProvisioningConfigurationParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/ProvisioningConfigurationParcelable.aidl
index 3a6c304..3a6c304 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/ProvisioningConfigurationParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/ProvisioningConfigurationParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/TcpKeepalivePacketDataParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/TcpKeepalivePacketDataParcelable.aidl
index e121c06..e121c06 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/TcpKeepalivePacketDataParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/TcpKeepalivePacketDataParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/dhcp/DhcpServingParamsParcel.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/dhcp/DhcpServingParamsParcel.aidl
index 67193ae..67193ae 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/dhcp/DhcpServingParamsParcel.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/dhcp/DhcpServingParamsParcel.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/dhcp/IDhcpServer.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/dhcp/IDhcpServer.aidl
index 9143158..9143158 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/dhcp/IDhcpServer.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/dhcp/IDhcpServer.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/dhcp/IDhcpServerCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/dhcp/IDhcpServerCallbacks.aidl
index dcc4489..dcc4489 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/dhcp/IDhcpServerCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/dhcp/IDhcpServerCallbacks.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/ip/IIpClient.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/ip/IIpClient.aidl
index 77d5917..77d5917 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/ip/IIpClient.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/ip/IIpClient.aidl
diff --git a/common/networkstackclient/aidl/networkstack/2/android/net/ip/IIpClientCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/ip/IIpClientCallbacks.aidl
index d6bc808..d6bc808 100644
--- a/common/networkstackclient/aidl/networkstack/2/android/net/ip/IIpClientCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/2/android/net/ip/IIpClientCallbacks.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/DhcpResultsParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/DhcpResultsParcelable.aidl
index 07ff321..07ff321 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/DhcpResultsParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/DhcpResultsParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/INetworkMonitor.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/INetworkMonitor.aidl
index 8aa68bd..8aa68bd 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/INetworkMonitor.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/INetworkMonitor.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/INetworkMonitorCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/INetworkMonitorCallbacks.aidl
index ea93729..ea93729 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/INetworkMonitorCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/INetworkMonitorCallbacks.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/INetworkStackConnector.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/INetworkStackConnector.aidl
index e3a83d1..e3a83d1 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/INetworkStackConnector.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/INetworkStackConnector.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/INetworkStackStatusCallback.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/INetworkStackStatusCallback.aidl
index 3112a08..3112a08 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/INetworkStackStatusCallback.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/INetworkStackStatusCallback.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/InitialConfigurationParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/InitialConfigurationParcelable.aidl
index f846b26..f846b26 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/InitialConfigurationParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/InitialConfigurationParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/NattKeepalivePacketDataParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/NattKeepalivePacketDataParcelable.aidl
index de75940..de75940 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/NattKeepalivePacketDataParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/NattKeepalivePacketDataParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/PrivateDnsConfigParcel.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/PrivateDnsConfigParcel.aidl
index cf0fbce..cf0fbce 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/PrivateDnsConfigParcel.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/PrivateDnsConfigParcel.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/ProvisioningConfigurationParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/ProvisioningConfigurationParcelable.aidl
index c0f2d4d..c0f2d4d 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/ProvisioningConfigurationParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/ProvisioningConfigurationParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/TcpKeepalivePacketDataParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/TcpKeepalivePacketDataParcelable.aidl
index 5926794..5926794 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/TcpKeepalivePacketDataParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/TcpKeepalivePacketDataParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/dhcp/DhcpServingParamsParcel.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/dhcp/DhcpServingParamsParcel.aidl
index 7ab156f..7ab156f 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/dhcp/DhcpServingParamsParcel.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/dhcp/DhcpServingParamsParcel.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/dhcp/IDhcpServer.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/dhcp/IDhcpServer.aidl
index d281ecf..d281ecf 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/dhcp/IDhcpServer.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/dhcp/IDhcpServer.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/dhcp/IDhcpServerCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/dhcp/IDhcpServerCallbacks.aidl
index 98be0ab..98be0ab 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/dhcp/IDhcpServerCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/dhcp/IDhcpServerCallbacks.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/ip/IIpClient.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/ip/IIpClient.aidl
index 85c8676..85c8676 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/ip/IIpClient.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/ip/IIpClient.aidl
diff --git a/common/networkstackclient/aidl/networkstack/3/android/net/ip/IIpClientCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/ip/IIpClientCallbacks.aidl
index 7fe39ed..7fe39ed 100644
--- a/common/networkstackclient/aidl/networkstack/3/android/net/ip/IIpClientCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/3/android/net/ip/IIpClientCallbacks.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/.hash b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/.hash
index f8d0743..f8d0743 100644
--- a/common/networkstackclient/aidl/networkstack/4/.hash
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/.hash
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/DhcpResultsParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/DhcpResultsParcelable.aidl
index 31891de..31891de 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/DhcpResultsParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/DhcpResultsParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/INetworkMonitor.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/INetworkMonitor.aidl
index 029968b..029968b 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/INetworkMonitor.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/INetworkMonitor.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/INetworkMonitorCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/INetworkMonitorCallbacks.aidl
index 2daadba..2daadba 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/INetworkMonitorCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/INetworkMonitorCallbacks.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/INetworkStackConnector.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/INetworkStackConnector.aidl
index 7da11e4..7da11e4 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/INetworkStackConnector.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/INetworkStackConnector.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/INetworkStackStatusCallback.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/INetworkStackStatusCallback.aidl
index f6ca6f7..f6ca6f7 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/INetworkStackStatusCallback.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/INetworkStackStatusCallback.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/InitialConfigurationParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/InitialConfigurationParcelable.aidl
index c80a787..c80a787 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/InitialConfigurationParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/InitialConfigurationParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/NattKeepalivePacketDataParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/NattKeepalivePacketDataParcelable.aidl
index 65de883..65de883 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/NattKeepalivePacketDataParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/NattKeepalivePacketDataParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/PrivateDnsConfigParcel.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/PrivateDnsConfigParcel.aidl
index 2de790b..2de790b 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/PrivateDnsConfigParcel.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/PrivateDnsConfigParcel.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/ProvisioningConfigurationParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/ProvisioningConfigurationParcelable.aidl
index 3a6c304..3a6c304 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/ProvisioningConfigurationParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/ProvisioningConfigurationParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/TcpKeepalivePacketDataParcelable.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/TcpKeepalivePacketDataParcelable.aidl
index e121c06..e121c06 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/TcpKeepalivePacketDataParcelable.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/TcpKeepalivePacketDataParcelable.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/dhcp/DhcpServingParamsParcel.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/dhcp/DhcpServingParamsParcel.aidl
index 67193ae..67193ae 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/dhcp/DhcpServingParamsParcel.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/dhcp/DhcpServingParamsParcel.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/dhcp/IDhcpServer.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/dhcp/IDhcpServer.aidl
index 9143158..9143158 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/dhcp/IDhcpServer.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/dhcp/IDhcpServer.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/dhcp/IDhcpServerCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/dhcp/IDhcpServerCallbacks.aidl
index dcc4489..dcc4489 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/dhcp/IDhcpServerCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/dhcp/IDhcpServerCallbacks.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/ip/IIpClient.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/ip/IIpClient.aidl
index 176a5ce..176a5ce 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/ip/IIpClient.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/ip/IIpClient.aidl
diff --git a/common/networkstackclient/aidl/networkstack/4/android/net/ip/IIpClientCallbacks.aidl b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/ip/IIpClientCallbacks.aidl
index d6bc808..d6bc808 100644
--- a/common/networkstackclient/aidl/networkstack/4/android/net/ip/IIpClientCallbacks.aidl
+++ b/common/networkstackclient/aidl_api/networkstack-aidl-interfaces/4/android/net/ip/IIpClientCallbacks.aidl