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