Auto merge of #2626 - Mek101:master, r=Amanieu

Add android ioctl constansts: BLKSSZGET and BLKPBSZGET

Adds the linux ioctl constants to android

Author: bors

libc-test/semver/android.txt

@@ -666,6 +666,8 @@ HPFS_SUPER_MAGIC
 HUGETLBFS_MAGIC
 HUPCL
 IBSHIFT
+BLKSSZGET
+BLKPBSZGET
 ICANON
 ICRNL
 IEXTEN

src/unix/linux_like/android/mod.rs

@@ -1548,6 +1548,9 @@ pub const B3500000: ::speed_t = 0o010016;
 pub const B4000000: ::speed_t = 0o010017;
 pub const IBSHIFT: ::tcflag_t = 16;
 
+pub const BLKSSZGET: ::c_int = 0x1268;
+pub const BLKPBSZGET: ::c_int = 0x127B;
+
 pub const EAI_AGAIN: ::c_int = 2;
 pub const EAI_BADFLAGS: ::c_int = 3;
 pub const EAI_FAIL: ::c_int = 4;