Fix Android build woes.