Merge "hikey960: hikey: add target for AOSP TV builds"