Merge "Copy the 464xlat vendor property to an AOSP property."