Fix names of #include guard symbols.

Subsequent discussion recommended "ANDROID_" prefix.

Pattern: ANDROID_FRAMEWORKS_ML_${RELPATH}_H, where ${RELPATH} is relative to
frameworks/ml, with "include" path component (if any) removed,
everything in caps, and word breaks indicated by underscores (rather
than by upper case).  This is derived from our current practices in
frameworks/ml.

Generate name: ANDROID_FRAMEWORKS_ML_$(echo ${RELPATH} | sed -e 's!/include!!g' -e 's![/.]!_!g' -e 's!\([^_A-Z]\)\([A-Z]\)!\1_\2!g' | awk '{ print toupper($1); }')

Bug: 129138718

Test: cd frameworks/ml ; mma

Change-Id: Ida001ba3767e8a6984e47b3570c69b1ba91f8bd4
Merged-In: Ida001ba3767e8a6984e47b3570c69b1ba91f8bd4

64 files changed, 192 insertions, 192 deletions

diff --git a/nn/common/include/ActivationFunctor.h b/nn/common/include/ActivationFunctor.h
index ec3d200aa..d667ae1c0 100644
--- a/nn/common/include/ActivationFunctor.h
+++ b/nn/common/include/ActivationFunctor.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H
-#define FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H
 
 #include <android/log.h>
 
@@ -60,4 +60,4 @@ class ActivationFunctor {
   ActivationFn act_;
 };
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_ACTIVATION_FUNCTOR_H
diff --git a/nn/common/include/CpuExecutor.h b/nn/common/include/CpuExecutor.h
index a6367d1ff..db8509e85 100644
--- a/nn/common/include/CpuExecutor.h
+++ b/nn/common/include/CpuExecutor.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H
-#define FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H
 
 #include "HalInterfaces.h"
 #include "OperationResolver.h"
@@ -272,4 +272,4 @@ inline RunTimeOperandInfo* GetOutput(const hal::Operation& operation,
 } // namespace nn
 } // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_EXECUTOR_H
diff --git a/nn/common/include/CpuOperationUtils.h b/nn/common/include/CpuOperationUtils.h
index 16acfa5ca..45404573b 100644
--- a/nn/common/include/CpuOperationUtils.h
+++ b/nn/common/include/CpuOperationUtils.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H
-#define FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H
 
 #include "OperationsUtils.h"
 
@@ -195,4 +195,4 @@ class OutputWithLayout {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_CPU_OPERATION_UTILS_H
diff --git a/nn/common/include/ExecutionBurstController.h b/nn/common/include/ExecutionBurstController.h
index e12855c8e..df7e91cc0 100644
--- a/nn/common/include/ExecutionBurstController.h
+++ b/nn/common/include/ExecutionBurstController.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H
-#define FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H
 
 #include "HalInterfaces.h"
 
@@ -336,4 +336,4 @@ class ExecutionBurstController {
 
 }  // namespace android::nn
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_CONTROLLER_H
diff --git a/nn/common/include/ExecutionBurstServer.h b/nn/common/include/ExecutionBurstServer.h
index 870e46879..977d0d375 100644
--- a/nn/common/include/ExecutionBurstServer.h
+++ b/nn/common/include/ExecutionBurstServer.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H
-#define FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H
 
 #include "HalInterfaces.h"
 
@@ -310,4 +310,4 @@ class ExecutionBurstServer : public hal::IBurstContext {
 
 }  // namespace android::nn
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_EXECUTION_BURST_SERVER_H
diff --git a/nn/common/include/GraphDump.h b/nn/common/include/GraphDump.h
index 1697e574c..1bf02b90e 100644
--- a/nn/common/include/GraphDump.h
+++ b/nn/common/include/GraphDump.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H
-#define FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H
 
 #include <android/hardware/neuralnetworks/1.2/types.h>
 
@@ -52,4 +52,4 @@ void graphDump(const char* name,
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_GRAPH_DUMP_H
diff --git a/nn/common/include/HalInterfaces.h b/nn/common/include/HalInterfaces.h
index 1163a637e..a518b4347 100644
--- a/nn/common/include/HalInterfaces.h
+++ b/nn/common/include/HalInterfaces.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H
-#define FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H
 
 #include <android/hardware/neuralnetworks/1.0/IDevice.h>
 #include <android/hardware/neuralnetworks/1.0/IExecutionCallback.h>
@@ -93,4 +93,4 @@ using namespace hal;
 using ::android::hardware::neuralnetworks::V1_0::ErrorStatus;
 using ::android::hardware::neuralnetworks::V1_1::ExecutionPreference;
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_HAL_INTERFACES_H
diff --git a/nn/common/include/IndexedShapeWrapper.h b/nn/common/include/IndexedShapeWrapper.h
index ebdf124e8..0298de465 100644
--- a/nn/common/include/IndexedShapeWrapper.h
+++ b/nn/common/include/IndexedShapeWrapper.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H
-#define FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H
 
 #include "OperationsUtils.h"
 
@@ -62,4 +62,4 @@ class IndexedShapeWrapper {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_INDEXED_SHAPE_WRAPPER_H
diff --git a/nn/common/include/MemoryUtils.h b/nn/common/include/MemoryUtils.h
index bc272620c..5470fd9c5 100644
--- a/nn/common/include/MemoryUtils.h
+++ b/nn/common/include/MemoryUtils.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef ANDROID_ML_NN_COMMON_MEMORY_UTILS_H
-#define ANDROID_ML_NN_COMMON_MEMORY_UTILS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_MEMORY_UTILS_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_MEMORY_UTILS_H
 
 #include <hidlmemory/mapping.h>
 
@@ -30,4 +30,4 @@ hardware::hidl_memory allocateSharedMemory(int64_t size);
 }  // namespace nn
 }  // namespace android
 
-#endif  // ANDROID_ML_NN_COMMON_MEMORY_UTILS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_MEMORY_UTILS_H
diff --git a/nn/common/include/MetaModel.h b/nn/common/include/MetaModel.h
index 2f9a1b1d3..89aee9f0b 100644
--- a/nn/common/include/MetaModel.h
+++ b/nn/common/include/MetaModel.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_META_MODEL_H
-#define FRAMEWORKS_ML_NN_COMMON_META_MODEL_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_META_MODEL_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_META_MODEL_H
 
 #include "HalInterfaces.h"
 
@@ -140,4 +140,4 @@ class MetaModel {
 
 }  // namespace android::nn
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_META_MODEL_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_META_MODEL_H
diff --git a/nn/common/include/OperationResolver.h b/nn/common/include/OperationResolver.h
index d17cc343a..ab70e4c3a 100644
--- a/nn/common/include/OperationResolver.h
+++ b/nn/common/include/OperationResolver.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H
 
 #include "HalInterfaces.h"
 #include "OperationsUtils.h"
@@ -138,4 +138,4 @@ class BuiltinOperationResolver : public IOperationResolver {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATION_RESOLVER_H
diff --git a/nn/common/include/Operations.h b/nn/common/include/Operations.h
index 254c4ecc6..7e6a9b200 100644
--- a/nn/common/include/Operations.h
+++ b/nn/common/include/Operations.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H
 
 #include "operations/BidirectionalSequenceLSTM.h"
 #include "operations/Cast.h"
@@ -171,4 +171,4 @@ bool channelShuffleGeneric(const uint8_t* inputData, const Shape& inputShape, in
                            int32_t axis, uint8_t* outputData, const Shape& outputShape);
 }  // namespace nn
 }  // namespace android
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_H
diff --git a/nn/common/include/OperationsUtils.h b/nn/common/include/OperationsUtils.h
index fa2c11e20..381bc8e16 100644
--- a/nn/common/include/OperationsUtils.h
+++ b/nn/common/include/OperationsUtils.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H
 
 #include "HalInterfaces.h"
 #include "Utils.h"
@@ -431,4 +431,4 @@ inline bool mergeThirdDimension(const T* bufferA, const std::vector<uint32_t>& d
 } // namespace nn
 } // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_UTILS_H
diff --git a/nn/common/include/TokenHasher.h b/nn/common/include/TokenHasher.h
index db5ebe62e..3245138dd 100644
--- a/nn/common/include/TokenHasher.h
+++ b/nn/common/include/TokenHasher.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H
-#define FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H
 
 #include <cstring>
 #include <vector>
@@ -68,4 +68,4 @@ class TokenHasher {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_TOKEN_HASHER_H
diff --git a/nn/common/include/Tracing.h b/nn/common/include/Tracing.h
index 6b7775a3b..01535d831 100644
--- a/nn/common/include/Tracing.h
+++ b/nn/common/include/Tracing.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_TRACING_H
-#define FRAMEWORKS_ML_NN_COMMON_TRACING_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_TRACING_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_TRACING_H
 
 #define ATRACE_TAG ATRACE_TAG_NNAPI
 #include <utils/Trace.h>
@@ -171,4 +171,4 @@
 #undef ATRACE_NAME
 #undef ATRACE_CALL
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_TRACING_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_TRACING_H
diff --git a/nn/common/include/Utils.h b/nn/common/include/Utils.h
index 343557f83..c7d86863b 100644
--- a/nn/common/include/Utils.h
+++ b/nn/common/include/Utils.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_UTILS_H
-#define FRAMEWORKS_ML_NN_COMMON_UTILS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_UTILS_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_UTILS_H
 
 #include "HalInterfaces.h"
 #include "NeuralNetworks.h"
@@ -368,4 +368,4 @@ uint32_t getProp(const char* str, uint32_t defaultValue = 0);
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_UTILS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_UTILS_H
diff --git a/nn/common/include/ValidateHal.h b/nn/common/include/ValidateHal.h
index ed5e70623..40733bb5a 100644
--- a/nn/common/include/ValidateHal.h
+++ b/nn/common/include/ValidateHal.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H
-#define FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H
 
 #include "HalInterfaces.h"
 
@@ -62,4 +62,4 @@ bool validatePool(const hal::hidl_memory& pool, HalVersion ver = HalVersion::LAT
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_VALIDATE_HAL_H
diff --git a/nn/common/operations/BidirectionalSequenceLSTM.h b/nn/common/operations/BidirectionalSequenceLSTM.h
index 8d2a49438..4dc0718fc 100644
--- a/nn/common/operations/BidirectionalSequenceLSTM.h
+++ b/nn/common/operations/BidirectionalSequenceLSTM.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
 
 #include "ActivationFunctor.h"
 #include "HalOperation.h"
@@ -232,4 +232,4 @@ class BidirectionalSequenceLSTM {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_BIDIRECTIONAL_SEQUENCE_LSTM_H
diff --git a/nn/common/operations/Cast.h b/nn/common/operations/Cast.h
index 3069a2ab9..c1f65cdb6 100644
--- a/nn/common/operations/Cast.h
+++ b/nn/common/operations/Cast.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_CAST_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_CAST_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_CAST_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_CAST_H
 
 #include "CpuOperationUtils.h"
 
@@ -32,4 +32,4 @@ bool eval(const uint8_t* inputData, const Shape& inputShape, uint8_t* outputData
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_CAST_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_CAST_H
diff --git a/nn/common/operations/EmbeddingLookup.h b/nn/common/operations/EmbeddingLookup.h
index 35847c772..bb89e24b2 100644
--- a/nn/common/operations/EmbeddingLookup.h
+++ b/nn/common/operations/EmbeddingLookup.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
 
 #include "HalOperation.h"
 
@@ -48,4 +48,4 @@ class EmbeddingLookup {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EMBEDDING_LOOKUP_H
diff --git a/nn/common/operations/ExpandDims.h b/nn/common/operations/ExpandDims.h
index 35aafa054..4661fbecb 100644
--- a/nn/common/operations/ExpandDims.h
+++ b/nn/common/operations/ExpandDims.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EXPAND_DIMS_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EXPAND_DIMS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EXPAND_DIMS_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EXPAND_DIMS_H
 
 #include "CpuOperationUtils.h"
 
@@ -32,4 +32,4 @@ bool eval(const uint8_t* inputData, const Shape& inputShape, int32_t axis, uint8
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EXPAND_DIMS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_EXPAND_DIMS_H
diff --git a/nn/common/operations/HalOperation.h b/nn/common/operations/HalOperation.h
index 2d9df8c9e..d89e83a82 100644
--- a/nn/common/operations/HalOperation.h
+++ b/nn/common/operations/HalOperation.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HAL_OPERATION_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HAL_OPERATION_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HAL_OPERATION_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HAL_OPERATION_H
 
 namespace android::hardware::neuralnetworks::V1_2 {
 
@@ -26,4 +26,4 @@ struct Operation;
 
 }  // namespace android::hardware::neuralnetworks::V1_2
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HAL_OPERATION_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HAL_OPERATION_H
diff --git a/nn/common/operations/HashtableLookup.h b/nn/common/operations/HashtableLookup.h
index 87cd99b73..52d9cc5bc 100644
--- a/nn/common/operations/HashtableLookup.h
+++ b/nn/common/operations/HashtableLookup.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
 
 #include "HalOperation.h"
 
@@ -52,4 +52,4 @@ class HashtableLookup {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_HASHTABLE_LOOKUP_H
diff --git a/nn/common/operations/LSHProjection.h b/nn/common/operations/LSHProjection.h
index 8ea96209b..891942530 100644
--- a/nn/common/operations/LSHProjection.h
+++ b/nn/common/operations/LSHProjection.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSHPROJECTION_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSHPROJECTION_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSHPROJECTION_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSHPROJECTION_H
 
 #include "HalOperation.h"
 
@@ -77,4 +77,4 @@ void DenseLshProjection(const RunTimeOperandInfo* hash, const RunTimeOperandInfo
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSHPROJECTION_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSHPROJECTION_H
diff --git a/nn/common/operations/LSTM.h b/nn/common/operations/LSTM.h
index 686013367..d0545c4d7 100644
--- a/nn/common/operations/LSTM.h
+++ b/nn/common/operations/LSTM.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSTM_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSTM_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSTM_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSTM_H
 
 #include "ActivationFunctor.h"
 #include "HalOperation.h"
@@ -247,4 +247,4 @@ class LSTMCell {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSTM_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_LSTM_H
diff --git a/nn/common/operations/MaximumMinimum.h b/nn/common/operations/MaximumMinimum.h
index 535e1b584..1a0e23030 100644
--- a/nn/common/operations/MaximumMinimum.h
+++ b/nn/common/operations/MaximumMinimum.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
 
 #include "CpuOperationUtils.h"
 
@@ -32,4 +32,4 @@ bool eval(const void* in1, const Shape& shape1, const void* in2, const Shape& sh
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MAXIMUM_MINIMUM_H
diff --git a/nn/common/operations/Multinomial.h b/nn/common/operations/Multinomial.h
index 0e154b768..8eb6ea3c2 100644
--- a/nn/common/operations/Multinomial.h
+++ b/nn/common/operations/Multinomial.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MULTINOMIAL_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MULTINOMIAL_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MULTINOMIAL_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MULTINOMIAL_H
 
 #include "HalOperation.h"
 
@@ -58,4 +58,4 @@ class Multinomial {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MULTINOMIAL_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_MULTINOMIAL_H
diff --git a/nn/common/operations/Pow.h b/nn/common/operations/Pow.h
index 39811dfd3..8d25d5cf0 100644
--- a/nn/common/operations/Pow.h
+++ b/nn/common/operations/Pow.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_POW_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_POW_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_POW_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_POW_H
 
 #include "CpuOperationUtils.h"
 
@@ -32,4 +32,4 @@ bool eval(const void* baseData, const Shape& baseShape, const void* exponentData
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_POW_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_POW_H
diff --git a/nn/common/operations/QuantizedLSTM.h b/nn/common/operations/QuantizedLSTM.h
index 14f7ba38e..8c04d9b5b 100644
--- a/nn/common/operations/QuantizedLSTM.h
+++ b/nn/common/operations/QuantizedLSTM.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_QUANTIZED_LSTM_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_QUANTIZED_LSTM_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_QUANTIZED_LSTM_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_QUANTIZED_LSTM_H
 
 #include "HalOperation.h"
 #include "OperationsUtils.h"
@@ -79,4 +79,4 @@ class QuantizedLSTMCell {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_QUANTIZED_LSTM_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_QUANTIZED_LSTM_H
diff --git a/nn/common/operations/RNN.h b/nn/common/operations/RNN.h
index 138af5ee6..f4affe062 100644
--- a/nn/common/operations/RNN.h
+++ b/nn/common/operations/RNN.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_RNN_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_RNN_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_RNN_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_RNN_H
 
 #include "ActivationFunctor.h"
 #include "HalOperation.h"
@@ -77,4 +77,4 @@ class RNN {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_RNN_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_RNN_H
diff --git a/nn/common/operations/SVDF.h b/nn/common/operations/SVDF.h
index bda1492d0..2073f4862 100644
--- a/nn/common/operations/SVDF.h
+++ b/nn/common/operations/SVDF.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_SVDF_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_SVDF_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_SVDF_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_SVDF_H
 
 #include "HalOperation.h"
 
@@ -75,4 +75,4 @@ class SVDF {
 }  // namespace nn
 }  // namespace android
 
-#endif
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_SVDF_H
diff --git a/nn/common/operations/Tile.h b/nn/common/operations/Tile.h
index 9ba70a6fb..25b6d4765 100644
--- a/nn/common/operations/Tile.h
+++ b/nn/common/operations/Tile.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TILE_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TILE_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TILE_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TILE_H
 
 #include "CpuOperationUtils.h"
 
@@ -33,4 +33,4 @@ bool eval(const uint8_t* inputData, const Shape& inputShape, const int32_t* mult
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TILE_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TILE_H
diff --git a/nn/common/operations/TopK_V2.h b/nn/common/operations/TopK_V2.h
index d8730e03c..77ee1865a 100644
--- a/nn/common/operations/TopK_V2.h
+++ b/nn/common/operations/TopK_V2.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TOP_K_V2_H
-#define FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TOP_K_V2_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TOP_K_V2_H
+#define ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TOP_K_V2_H
 
 #include "CpuOperationUtils.h"
 
@@ -32,4 +32,4 @@ bool eval(const void* inputData, const Shape& inputShape, const int32_t k, void*
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TOP_K_V2_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_COMMON_OPERATIONS_TOP_K_V2_H
diff --git a/nn/driver/cache/BlobCache/BlobCache.h b/nn/driver/cache/BlobCache/BlobCache.h
index 01c76701c..d79a23de4 100644
--- a/nn/driver/cache/BlobCache/BlobCache.h
+++ b/nn/driver/cache/BlobCache/BlobCache.h
@@ -14,8 +14,8 @@
  ** limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_DRIVER_CACHE_BLOB_CACHE_BLOB_CACHE_H
-#define FRAMEWORKS_ML_NN_DRIVER_CACHE_BLOB_CACHE_BLOB_CACHE_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_DRIVER_CACHE_BLOB_CACHE_BLOB_CACHE_H
+#define ANDROID_FRAMEWORKS_ML_NN_DRIVER_CACHE_BLOB_CACHE_BLOB_CACHE_H
 
 #include <stddef.h>
 
@@ -351,4 +351,4 @@ private:
 
 }
 
-#endif  // FRAMEWORKS_ML_NN_DRIVER_CACHE_BLOB_CACHE_BLOB_CACHE_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_DRIVER_CACHE_BLOB_CACHE_BLOB_CACHE_H
diff --git a/nn/driver/cache/nnCache/nnCache.h b/nn/driver/cache/nnCache/nnCache.h
index eb3d3bba9..43f4ec350 100644
--- a/nn/driver/cache/nnCache/nnCache.h
+++ b/nn/driver/cache/nnCache/nnCache.h
@@ -14,8 +14,8 @@
  ** limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_DRIVER_CACHE_NN_CACHE_NN_CACHE_H
-#define FRAMEWORKS_ML_NN_DRIVER_CACHE_NN_CACHE_NN_CACHE_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_DRIVER_CACHE_NN_CACHE_NN_CACHE_H
+#define ANDROID_FRAMEWORKS_ML_NN_DRIVER_CACHE_NN_CACHE_NN_CACHE_H
 
 #include "BlobCache.h"
 
@@ -156,4 +156,4 @@ private:
 }; // namespace android
 // ----------------------------------------------------------------------------
 
-#endif  // FRAMEWORKS_ML_NN_DRIVER_CACHE_NN_CACHE_NN_CACHE_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_DRIVER_CACHE_NN_CACHE_NN_CACHE_H
diff --git a/nn/driver/sample/SampleDriver.h b/nn/driver/sample/SampleDriver.h
index 82952c230..0e1839b95 100644
--- a/nn/driver/sample/SampleDriver.h
+++ b/nn/driver/sample/SampleDriver.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_H
-#define FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_H
+#define ANDROID_FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_H
 
 #include "CpuExecutor.h"
 #include "HalInterfaces.h"
@@ -111,4 +111,4 @@ class SamplePreparedModel : public hal::IPreparedModel {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_H
diff --git a/nn/driver/sample/SampleDriverFull.h b/nn/driver/sample/SampleDriverFull.h
index 634bc0145..66f4aa758 100644
--- a/nn/driver/sample/SampleDriverFull.h
+++ b/nn/driver/sample/SampleDriverFull.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_FULL_H
-#define FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_FULL_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_FULL_H
+#define ANDROID_FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_FULL_H
 
 #include "HalInterfaces.h"
 #include "SampleDriver.h"
@@ -40,4 +40,4 @@ class SampleDriverFull : public SampleDriver {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_FULL_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_DRIVER_SAMPLE_SAMPLE_DRIVER_FULL_H
diff --git a/nn/extensions/test_vendor/fibonacci/FibonacciExtension.h b/nn/extensions/test_vendor/fibonacci/FibonacciExtension.h
index 0b3268e78..3afd98139 100644
--- a/nn/extensions/test_vendor/fibonacci/FibonacciExtension.h
+++ b/nn/extensions/test_vendor/fibonacci/FibonacciExtension.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
-#define FRAMEWORKS_ML_NN_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
+#define ANDROID_FRAMEWORKS_ML_NN_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
 
 /**
  * A sample extension definition.
@@ -73,4 +73,4 @@ enum {
     TEST_VENDOR_FIBONACCI = 0,
 };
 
-#endif  // FRAMEWORKS_ML_NN_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_EXTENSIONS_TEST_VENDOR_FIBONACCI_FIBONACCI_EXTENSION_H
diff --git a/nn/runtime/BurstBuilder.h b/nn/runtime/BurstBuilder.h
index 27e41c120..bfb9a9a38 100644
--- a/nn/runtime/BurstBuilder.h
+++ b/nn/runtime/BurstBuilder.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_BURST_BUILDER_H
-#define FRAMEWORKS_ML_NN_RUNTIME_BURST_BUILDER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_BURST_BUILDER_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_BURST_BUILDER_H
 
 #include <atomic>
 #include <memory>
@@ -57,4 +57,4 @@ class BurstBuilder {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_BURST_BUILDER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_BURST_BUILDER_H
diff --git a/nn/runtime/Callbacks.h b/nn/runtime/Callbacks.h
index a2059ef08..7de29173d 100644
--- a/nn/runtime/Callbacks.h
+++ b/nn/runtime/Callbacks.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_CALLBACKS_H
-#define FRAMEWORKS_ML_NN_RUNTIME_CALLBACKS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_CALLBACKS_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_CALLBACKS_H
 
 #include "HalInterfaces.h"
 
@@ -374,4 +374,4 @@ class ExecutionCallback : public hal::IExecutionCallback {
 
 }  // namespace android::nn
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_CALLBACKS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_CALLBACKS_H
diff --git a/nn/runtime/CompilationBuilder.h b/nn/runtime/CompilationBuilder.h
index 818e8e2b0..7c0b786f8 100644
--- a/nn/runtime/CompilationBuilder.h
+++ b/nn/runtime/CompilationBuilder.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_COMPILATION_BUILDER_H
-#define FRAMEWORKS_ML_NN_RUNTIME_COMPILATION_BUILDER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_COMPILATION_BUILDER_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_COMPILATION_BUILDER_H
 
 #include "ExecutionPlan.h"
 #include "NeuralNetworks.h"
@@ -91,4 +91,4 @@ private:
 } // namespace nn
 } // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_COMPILATION_BUILDER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_COMPILATION_BUILDER_H
diff --git a/nn/runtime/ExecutionBuilder.h b/nn/runtime/ExecutionBuilder.h
index 3c0eb5b2f..6b730713f 100644
--- a/nn/runtime/ExecutionBuilder.h
+++ b/nn/runtime/ExecutionBuilder.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_BUILDER_H
-#define FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_BUILDER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_BUILDER_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_BUILDER_H
 
 #include "Callbacks.h"
 #include "HalInterfaces.h"
@@ -272,4 +272,4 @@ class StepExecutor {
 } // namespace nn
 } // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_BUILDER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_BUILDER_H
diff --git a/nn/runtime/ExecutionPlan.h b/nn/runtime/ExecutionPlan.h
index aaa4881fc..4ce4d71b7 100644
--- a/nn/runtime/ExecutionPlan.h
+++ b/nn/runtime/ExecutionPlan.h
@@ -16,8 +16,8 @@
 
 // Classes used to plan how to execute a model across multiple devices.
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_PLAN_H
-#define FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_PLAN_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_PLAN_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_PLAN_H
 
 #include "HalInterfaces.h"
 #include "Memory.h"
@@ -340,4 +340,4 @@ inline std::ostream& operator<<(std::ostream& out, ExecutionPlan::Kind kind) {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_PLAN_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_EXECUTION_PLAN_H
diff --git a/nn/runtime/Manager.h b/nn/runtime/Manager.h
index 8b5a3ae73..0c7ef0066 100644
--- a/nn/runtime/Manager.h
+++ b/nn/runtime/Manager.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_MANAGER_H
-#define FRAMEWORKS_ML_NN_RUNTIME_MANAGER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_MANAGER_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_MANAGER_H
 
 #include "HalInterfaces.h"
 #include "Utils.h"
@@ -183,4 +183,4 @@ class DeviceManager {
 } // namespace nn
 } // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_MANAGER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_MANAGER_H
diff --git a/nn/runtime/Memory.h b/nn/runtime/Memory.h
index 142128975..3c31c2e7f 100644
--- a/nn/runtime/Memory.h
+++ b/nn/runtime/Memory.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_MEMORY_H
-#define FRAMEWORKS_ML_NN_RUNTIME_MEMORY_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_MEMORY_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_MEMORY_H
 
 #include "HalInterfaces.h"
 #include "NeuralNetworks.h"
@@ -200,4 +200,4 @@ class MemoryTracker {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_MEMORY_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_MEMORY_H
diff --git a/nn/runtime/ModelBuilder.h b/nn/runtime/ModelBuilder.h
index 547476eea..6cf93b914 100644
--- a/nn/runtime/ModelBuilder.h
+++ b/nn/runtime/ModelBuilder.h
@@ -17,8 +17,8 @@
 // Class used to build a model through a succession of successive calls
 // to the NN API.
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_MODEL_BUILDER_H
-#define FRAMEWORKS_ML_NN_RUNTIME_MODEL_BUILDER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_MODEL_BUILDER_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_MODEL_BUILDER_H
 
 #include "HalInterfaces.h"
 #include "Memory.h"
@@ -181,4 +181,4 @@ class ModelBuilder {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_MODEL_BUILDER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_MODEL_BUILDER_H
diff --git a/nn/runtime/TypeManager.h b/nn/runtime/TypeManager.h
index 7fc4203d5..60f567912 100644
--- a/nn/runtime/TypeManager.h
+++ b/nn/runtime/TypeManager.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TYPE_MANAGER_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TYPE_MANAGER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TYPE_MANAGER_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TYPE_MANAGER_H
 
 #include "HalInterfaces.h"
 #include "Manager.h"
@@ -160,4 +160,4 @@ class TypeManager {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_TYPE_MANAGER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TYPE_MANAGER_H
diff --git a/nn/runtime/VersionedInterfaces.h b/nn/runtime/VersionedInterfaces.h
index f49800bcd..74f543088 100644
--- a/nn/runtime/VersionedInterfaces.h
+++ b/nn/runtime/VersionedInterfaces.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_VERSIONED_INTERFACES_H
-#define FRAMEWORKS_ML_NN_RUNTIME_VERSIONED_INTERFACES_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_VERSIONED_INTERFACES_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_VERSIONED_INTERFACES_H
 
 #include "HalInterfaces.h"
 
@@ -805,4 +805,4 @@ class VersionedIPreparedModel {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_VERSIONED_INTERFACES_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_VERSIONED_INTERFACES_H
diff --git a/nn/runtime/include/NeuralNetworks.h b/nn/runtime/include/NeuralNetworks.h
index 35eefec65..3a46e2dfd 100644
--- a/nn/runtime/include/NeuralNetworks.h
+++ b/nn/runtime/include/NeuralNetworks.h
@@ -23,8 +23,8 @@
  * @file NeuralNetworks.h
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_H
-#define FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_H
 
 /******************************************************************
  *
@@ -6444,6 +6444,6 @@ void ANeuralNetworksEvent_free(ANeuralNetworksEvent* event) __INTRODUCED_IN(27);
 
 __END_DECLS
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_H
 
 /** @} */
diff --git a/nn/runtime/include/NeuralNetworksExtensions.h b/nn/runtime/include/NeuralNetworksExtensions.h
index 91604cac8..429a1dcf8 100644
--- a/nn/runtime/include/NeuralNetworksExtensions.h
+++ b/nn/runtime/include/NeuralNetworksExtensions.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
-#define FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
 
 #include "NeuralNetworks.h"
 
@@ -114,4 +114,4 @@ int ANeuralNetworksModel_setOperandExtensionData(ANeuralNetworksModel* model, in
 
 __END_DECLS
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_EXTENSIONS_H
diff --git a/nn/runtime/include/NeuralNetworksOEM.h b/nn/runtime/include/NeuralNetworksOEM.h
index d83bdfb8b..45f6edf7b 100644
--- a/nn/runtime/include/NeuralNetworksOEM.h
+++ b/nn/runtime/include/NeuralNetworksOEM.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_OEM_H
-#define FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_OEM_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_OEM_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_OEM_H
 
 /******************************************************************
  *
@@ -70,4 +70,4 @@ enum {
 
 #endif  //  __ANDROID_API__ >= 27
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_OEM_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_OEM_H
diff --git a/nn/runtime/include/NeuralNetworksWrapper.h b/nn/runtime/include/NeuralNetworksWrapper.h
index 486bc8eba..f174459e9 100644
--- a/nn/runtime/include/NeuralNetworksWrapper.h
+++ b/nn/runtime/include/NeuralNetworksWrapper.h
@@ -16,8 +16,8 @@
 
 // Provides C++ classes to more easily use the Neural Networks API.
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
-#define FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
 
 #include "NeuralNetworks.h"
 
@@ -466,4 +466,4 @@ class Execution {
 }  // namespace nn
 }  // namespace android
 
-#endif  //  FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
+#endif  //  ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_H
diff --git a/nn/runtime/include/NeuralNetworksWrapperExtensions.h b/nn/runtime/include/NeuralNetworksWrapperExtensions.h
index bbc70072e..524e8da86 100644
--- a/nn/runtime/include/NeuralNetworksWrapperExtensions.h
+++ b/nn/runtime/include/NeuralNetworksWrapperExtensions.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
-#define FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
 
 #include "NeuralNetworksExtensions.h"
 #include "NeuralNetworksWrapper.h"
@@ -147,4 +147,4 @@ using ExtensionOperandParams = extension_wrapper::ExtensionOperandParams;
 }  // namespace nn
 }  // namespace android
 
-#endif  //  FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
+#endif  //  ANDROID_FRAMEWORKS_ML_NN_RUNTIME_NEURAL_NETWORKS_WRAPPER_EXTENSIONS_H
diff --git a/nn/runtime/test/Bridge.h b/nn/runtime/test/Bridge.h
index f06abb614..f067df0f3 100644
--- a/nn/runtime/test/Bridge.h
+++ b/nn/runtime/test/Bridge.h
@@ -20,8 +20,8 @@
 // contains a few utilities for tests to call that trampoline to the
 // internal headers.
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_BRIDGE_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TEST_BRIDGE_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_BRIDGE_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_BRIDGE_H
 
 #include <iostream>
 
@@ -39,4 +39,4 @@ void graphDump(const char* name, const ModelBuilder* model, std::ostream* outStr
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_TEST_BRIDGE_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_BRIDGE_H
diff --git a/nn/runtime/test/TestCompliance.h b/nn/runtime/test/TestCompliance.h
index 59aca18c2..00d1e24f6 100644
--- a/nn/runtime/test/TestCompliance.h
+++ b/nn/runtime/test/TestCompliance.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_COMPLIANCE_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_COMPLIANCE_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_COMPLIANCE_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_COMPLIANCE_H
 
 #include <gtest/gtest.h>
 
@@ -45,4 +45,4 @@ class ComplianceTest : public ::testing::Test {
 
 #endif
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_COMPLIANCE_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_COMPLIANCE_H
diff --git a/nn/runtime/test/TestGenerated.h b/nn/runtime/test/TestGenerated.h
index 7d7029458..2965d46c3 100644
--- a/nn/runtime/test/TestGenerated.h
+++ b/nn/runtime/test/TestGenerated.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_GENERATED_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_GENERATED_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_GENERATED_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_GENERATED_H
 
 #include <gtest/gtest.h>
 
@@ -96,4 +96,4 @@ class DynamicOutputShapeTest : public GeneratedTests {};
 
 using namespace generated_tests;
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_GENERATED_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_GENERATED_H
diff --git a/nn/runtime/test/TestMemory.h b/nn/runtime/test/TestMemory.h
index c711077da..57df0fe68 100644
--- a/nn/runtime/test/TestMemory.h
+++ b/nn/runtime/test/TestMemory.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_MEMORY_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_MEMORY_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_MEMORY_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_MEMORY_H
 
 #include <stdio.h>
 
@@ -52,4 +52,4 @@ const Matrix3x4 expected3 = {{121.f, 232.f, 343.f, 454.f},
 
 }  // anonymous namespace
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_MEMORY_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_MEMORY_H
diff --git a/nn/runtime/test/TestNeuralNetworksWrapper.h b/nn/runtime/test/TestNeuralNetworksWrapper.h
index 9e347a402..e37817058 100644
--- a/nn/runtime/test/TestNeuralNetworksWrapper.h
+++ b/nn/runtime/test/TestNeuralNetworksWrapper.h
@@ -17,8 +17,8 @@
 // Provides C++ classes to more easily use the Neural Networks API.
 // TODO(b/117845862): this should be auto generated from NeuralNetworksWrapper.h.
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
 
 #include "NeuralNetworks.h"
 #include "NeuralNetworksWrapper.h"
@@ -234,4 +234,4 @@ class Execution {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_TEST_NEURAL_NETWORKS_WRAPPER_H
diff --git a/nn/runtime/test/fibonacci_extension/FibonacciDriver.h b/nn/runtime/test/fibonacci_extension/FibonacciDriver.h
index 5cda2c846..dc883022b 100644
--- a/nn/runtime/test/fibonacci_extension/FibonacciDriver.h
+++ b/nn/runtime/test/fibonacci_extension/FibonacciDriver.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
 
 #include "HalInterfaces.h"
 #include "OperationResolver.h"
@@ -57,4 +57,4 @@ class FibonacciDriver : public SampleDriver {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FIBONACCI_EXTENSION_FIBONACCI_DRIVER_H
diff --git a/nn/runtime/test/fuzzing/OperationManager.h b/nn/runtime/test/fuzzing/OperationManager.h
index 5046e4c76..37870014c 100644
--- a/nn/runtime/test/fuzzing/OperationManager.h
+++ b/nn/runtime/test/fuzzing/OperationManager.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
 
 #include <functional>
 #include <map>
@@ -127,4 +127,4 @@ class OperationManager {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_MANAGER_H
diff --git a/nn/runtime/test/fuzzing/RandomGraphGenerator.h b/nn/runtime/test/fuzzing/RandomGraphGenerator.h
index 13cd42855..47c6d3eb5 100644
--- a/nn/runtime/test/fuzzing/RandomGraphGenerator.h
+++ b/nn/runtime/test/fuzzing/RandomGraphGenerator.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
 
 #include <string>
 #include <vector>
@@ -179,4 +179,4 @@ class RandomGraph {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_H
diff --git a/nn/runtime/test/fuzzing/RandomGraphGeneratorUtils.h b/nn/runtime/test/fuzzing/RandomGraphGeneratorUtils.h
index 4301c275e..1611a4aa6 100644
--- a/nn/runtime/test/fuzzing/RandomGraphGeneratorUtils.h
+++ b/nn/runtime/test/fuzzing/RandomGraphGeneratorUtils.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
 
 #include <chrono>
 #include <fstream>
@@ -454,4 +454,4 @@ inline void randomShuffle(std::vector<T>* vec) {
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_RANDOM_GRAPH_GENERATOR_UTILS_H
diff --git a/nn/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h b/nn/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h
index 43e201471..ca54c11cd 100644
--- a/nn/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h
+++ b/nn/runtime/test/fuzzing/operation_signatures/OperationSignatureUtils.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURES_OPERATION_SIGNATURE_UTILS_H
-#define FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURES_OPERATION_SIGNATURE_UTILS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURES_OPERATION_SIGNATURE_UTILS_H
+#define ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURES_OPERATION_SIGNATURE_UTILS_H
 
 #include <functional>
 #include <string>
@@ -404,4 +404,4 @@ inline void defaultOperandConstructor(Type dataType, uint32_t, RandomOperand* op
 }  // namespace nn
 }  // namespace android
 
-#endif  // FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURES_OPERATION_SIGNATURE_UTILS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_RUNTIME_TEST_FUZZING_OPERATION_SIGNATURES_OPERATION_SIGNATURE_UTILS_H
diff --git a/nn/tools/test_generator/include/TestHarness.h b/nn/tools/test_generator/include/TestHarness.h
index f7e46560e..e43658d03 100644
--- a/nn/tools/test_generator/include/TestHarness.h
+++ b/nn/tools/test_generator/include/TestHarness.h
@@ -17,8 +17,8 @@
 /* Header-only library for various helpers of test harness
  * See frameworks/ml/nn/runtime/test/TestGenerated.cpp for how this is used.
  */
-#ifndef FRAMEWORKS_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_H
-#define FRAMEWORKS_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_H
+#ifndef ANDROID_FRAMEWORKS_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_H
+#define ANDROID_FRAMEWORKS_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_H
 
 #include <gmock/gmock-matchers.h>
 #include <gtest/gtest.h>
@@ -424,4 +424,4 @@ inline void expectMultinomialDistributionWithinTolerance(const MixedTyped& test,
 
 };  // namespace test_helper
 
-#endif  // FRAMEWORKS_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_H
+#endif  // ANDROID_FRAMEWORKS_ML_NN_TOOLS_TEST_GENERATOR_TEST_HARNESS_H