Merge "Add a 64 bit only product for hikey." am: 0d5c865811 am: 0d67004f81
am: 66eb8a937e

Change-Id: Id212623e1a55aed929d3dbf2f2477a11955c4f3d