sync with armv7-multplatform as of v3.11.0

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>