resolve merge conflicts of b172f9e to master am: ed8e08ff82 am: 657bfbfb71 am: 29baf28a2f
-rw-r--r-- 188 .editorconfig
-rw-r--r-- 46 .gitignore
-rw-r--r-- 51291 Android.mk
-rw-r--r-- 11357 CMakeLists.txt
-rw-r--r-- 11362 LICENSE
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 11362 NOTICE
-rw-r--r-- 602 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