Fix Android build after r210053