Merge "Improve portability beyond Android"