Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream upstream upstream/12.09
drwxr-xr-x - android-libraries
drwxr-xr-x - android
-rwxr-xr-x 222 cleanup-script.sh
drwxr-xr-x - core