Merge tag 'android-8.1.0_r74' into oreo-x86

Android 8.1.0 release 74

diff --combined libs/sensor/Sensor.cpp
index 8ea97ca,2383516..4aa9bd9
--- 1/libs/sensor/Sensor.cpp
--- 2/libs/sensor/Sensor.cpp
+++ b/libs/sensor/Sensor.cpp
@@@ -462,10 -462,10 +462,10 @@@ size_t Sensor::getFlattenedSize() cons
              sizeof(mRequiredAppOp) + sizeof(mMaxDelay) + sizeof(mFlags) + sizeof(mUuid);
  
      size_t variableSize =
 -            sizeof(uint32_t) + FlattenableUtils::align<4>(mName.length()) +
 -            sizeof(uint32_t) + FlattenableUtils::align<4>(mVendor.length()) +
 -            sizeof(uint32_t) + FlattenableUtils::align<4>(mStringType.length()) +
 -            sizeof(uint32_t) + FlattenableUtils::align<4>(mRequiredPermission.length());
 +            sizeof(size_t) + FlattenableUtils::align<sizeof(size_t)>(mName.length()) +
 +            sizeof(size_t) + FlattenableUtils::align<sizeof(size_t)>(mVendor.length()) +
 +            sizeof(size_t) + FlattenableUtils::align<sizeof(size_t)>(mStringType.length()) +
 +            sizeof(size_t) + FlattenableUtils::align<sizeof(size_t)>(mRequiredPermission.length());
  
      return fixedSize + variableSize;
  }
@@@ -562,7 -562,8 +562,8 @@@ void Sensor::flattenString8(void*& buff
      uint32_t len = static_cast<uint32_t>(string8.length());
      FlattenableUtils::write(buffer, size, len);
      memcpy(static_cast<char*>(buffer), string8.string(), len);
-     FlattenableUtils::advance(buffer, size, FlattenableUtils::align<4>(len));
+     FlattenableUtils::advance(buffer, size, len);
+     size -= FlattenableUtils::align<4>(buffer);
  }
  
  bool Sensor::unflattenString8(void const*& buffer, size_t& size, String8& outputString8) {