Duplicate svn revision 368293 and fix compilation on armv6.
PR: 197092 Submitted by: mikael.urankar@gmail.com