Merge "Update manifest-arm to make it identical to the x86 version"