Merge the 2019-08-01 SPL branch from AOSP-Partner

* security-aosp-nyc-mr2-release:
  Decoder: Delete node from st if lt and st point to same

Change-Id: I2f1cdf25a93359fc1f7c1498149dd5ddd7318a07
diff --git a/encoder.mk b/encoder.mk
index 7efcda2..58ec73f 100644
--- a/encoder.mk
+++ b/encoder.mk
@@ -10,7 +10,7 @@
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
 LOCAL_CFLAGS += -DNDEBUG -UHP_PL -DN_MB_ENABLE -fPIC
-LOCAL_CFLAGS += -O3
+LOCAL_CFLAGS += -O3 -mno-unaligned-access
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/encoder $(LOCAL_PATH)/common