[olive/f36] (2 commits) ...add patch to fix armv7 build