Fixing the ABI boxes in the Android Sample