resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp am: ed852bf557 am: 900673646e
-rw-r--r-- 188 .editorconfig
-rw-r--r-- 54 .gitignore
-rw-r--r-- 1683 Android.mk
-rw-r--r-- 55939 AndroidGen.mk
-rw-r--r-- 11577 CMakeLists.txt
-rw-r--r-- 11362 LICENSE
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 11362 NOTICE
-rw-r--r-- 76 OWNERS
-rw-r--r-- 864 README.md
drwxr-xr-x - android
drwxr-xr-x - data
drwxr-xr-x - doc
drwxr-xr-x - execserver
drwxr-xr-x - executor
drwxr-xr-x - external
drwxr-xr-x - framework
drwxr-xr-x - modules
drwxr-xr-x - scripts
drwxr-xr-x - targets