Merge "Resolve "unused DT entry" warnings for x86_64"