Switch to standard naming scheme am: 6e2418e276

Original change: https://android-review.googlesource.com/c/platform/packages/modules/SdkExtensions/+/1325833

Change-Id: I9583dfb804dc9d4f86b570c4a3a860f43595605e