Merge branch 'upstream' into debian
drwxr-xr-x - android-libraries
drwxr-xr-x - android
drwxr-xr-x - core
drwxr-xr-x - debian