Merge "skip seccomp test on media.codec on 64bit only devices" into stage-aosp-sc-ts-dev