Trianglized - please cherry-pick this commit when resetting android_build