Android buildfix & retab