Merge remote-tracking branch 'origin/TIKA-4747-add-axml-detection' into TIKA-4747-add-axml-detection

# Conflicts:
#	tika-parsers/tika-parsers-standard/tika-parsers-standard-integration-tests/src/test/java/org/apache/tika/parser/AndroidBinaryXMLTest.java

Author: tballison

tika-core/src/test/resources/org/apache/tika/mime/test-android-binary.xml

@@ -63,7 +63,7 @@ private static byte[] axmlBytes() {
         bb.putInt(64);                 // total chunk size == file length (skipped by magic)
         bb.putShort((short) 0x0001);   // RES_STRING_POOL_TYPE (checked at offset 8)
         bb.putShort((short) 0x001C);   // string-pool headerSize
-        bb.putInt(0x0000003C);         // string-pool chunk size
+        bb.putInt(0x00000038);         // string-pool chunk size == 64 - 8 (spans offset 8..EOF)
         // remaining bytes (string/style counts, flags, offsets) left zero
         return bb.array();
     }