[automerger skipped] Style fixes in the external pref64 support. am:...
[automerger skipped] Style fixes in the external pref64 support. am: 35777880 am: 28a5b826 -s ours
am skip reason: Change-Id Ifcdb16cc66c9234a2bd5f8aac70be809fe0dd223 with SHA-1 511b6d4f is in history
Change-Id: I854f02b38c8f3decd31dd7d34b6554c6bde4ebd8