Fix Android mode support on MacOS X#2525

jasstrong wants to merge 2 commits intoprocessing:masterprocessing/processing:masterfrom

jasstrong:masterjasstrong/processing:masterCopy head branch name to clipboard