Merge commit '33ebb838720fdc9d4b75f74ec18e45c22a66c3f6' into merge
-rw-r--r-- 31 .gitignore
-rw-r--r-- 26370 Android.mk
-rw-r--r-- 11117 CMakeLists.txt
-rw-r--r-- 11362 LICENSE
-rw-r--r-- 0 MODULE_LICENSE_APACHE2
-rw-r--r-- 11362 NOTICE
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