Merge commit '46077ef99f953486550547c15bd60dd02bab9241' into upstream
drwxr-xr-x - android
-rwxr-xr-x 222 cleanup-script.sh
drwxr-xr-x - core