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

Change-Id: Ia7dd22ac6664d0fe14fee5613eddea02781a6a4a