Install runtime resource overlay without subdir.

am: a08a1015bc

Change-Id: I1ca2e029b79bf125145d2031a722914fe24dd299

diff --cc core/base_rules.mk
Simple merge

diff --cc core/clear_vars.mk
index fa62c31,fdaa624..71e73a4
--- 1/core/clear_vars.mk
--- 2/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@@ -375,20 -362,10 +375,22 @@@ LOCAL_CLANG_32:
  LOCAL_CLANG_64:=
  LOCAL_INIT_RC_32:=
  LOCAL_INIT_RC_64:=
 +LOCAL_MODULE_SYMLINKS_32:=
 +LOCAL_MODULE_SYMLINKS_64:=
  LOCAL_JAVA_LANGUAGE_VERSION:=
+ LOCAL_IS_RUNTIME_RESOURCE_OVERLAY:=
+ LOCAL_RRO_SKU:=
  
 +LOCAL_IS_AUX_MODULE :=
 +LOCAL_AUX_TOOLCHAIN :=
 +LOCAL_AUX_OS :=
 +LOCAL_AUX_ARCH :=
 +LOCAL_AUX_SUBARCH :=
 +LOCAL_AUX_CPU :=
 +LOCAL_AUX_OS_VARIANT :=
 +LOCAL_CUSTOM_BUILD_STEP_INPUT:=
 +LOCAL_CUSTOM_BUILD_STEP_OUTPUT:=
 +
  # Trim MAKEFILE_LIST so that $(call my-dir) doesn't need to
  # iterate over thousands of entries every time.
  # Leave the current makefile to make sure we don't break anything

diff --cc core/config.mk
Simple merge