Merge "hikey960: hikey: add target for AOSP TV builds" am: 64a2c4b3a2
am: 34bf915efd

Change-Id: I7b22ca08465922160d466416874665c20390f2a3