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