reconcile korg/master into goog/master
-rw-r--r-- 839 Android.mk
-rw-r--r-- 0 MODULE_LICENSE_BSD_LIKE
-rw-r--r-- 849 NOTICE
drwxr-xr-x - include
drwxr-xr-x - src
drwxr-xr-x - testsuite