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

Change-Id: Id53af118f2521daebb36734ab50cae663dcb4216