diff -Nru android-headers-23/debian/changelog android-headers-23/debian/changelog
--- android-headers-23/debian/changelog	2016-04-11 09:06:41.000000000 +0000
+++ android-headers-23/debian/changelog	2016-08-16 08:16:08.000000000 +0000
@@ -1,3 +1,10 @@
+android-headers (23-0ubuntu4~xenial1) xenial; urgency=medium
+
+  [ You-Sheng Yang ]
+  * android-19: hardware: align struct size on arm64
+
+ -- Simon Fels <simon.fels@canonical.com>  Tue, 16 Aug 2016 09:23:00 +0200
+
 android-headers (23-0ubuntu3) xenial; urgency=medium
 
   * debian/android-headers.{preinst,postinst,postrm}: Use
diff -Nru android-headers-23/debian/patches/debian-changes android-headers-23/debian/patches/debian-changes
--- android-headers-23/debian/patches/debian-changes	2016-04-11 09:07:19.000000000 +0000
+++ android-headers-23/debian/patches/debian-changes	2016-08-16 08:16:13.000000000 +0000
@@ -94,6 +94,33 @@
  
      /**
       * set_mode is called when the audio mode changes. AUDIO_MODE_NORMAL mode
+--- android-headers-23.orig/19/hardware/hardware.h
++++ android-headers-23/19/hardware/hardware.h
+@@ -144,8 +144,12 @@ typedef struct hw_module_t {
+     /** module's dso */
+     void* dso;
+ 
++#ifdef __LP64__
++    uint64_t reserved[32-7];
++#else
+     /** padding to 128 bytes, reserved for future use */
+     uint32_t reserved[32-7];
++#endif
+ 
+ } hw_module_t;
+ 
+@@ -186,7 +190,11 @@ typedef struct hw_device_t {
+     struct hw_module_t* module;
+ 
+     /** padding reserved for future use */
++#ifdef __LP64__
++    uint64_t reserved[12];
++#else
+     uint32_t reserved[12];
++#endif
+ 
+     /** Close this device */
+     int (*close)(struct hw_device_t* device);
 --- android-headers-23.orig/19/hardware/hwcomposer.h
 +++ android-headers-23/19/hardware/hwcomposer.h
 @@ -121,6 +121,33 @@ typedef struct hwc_layer_1 {