Merge "Enable FULL_TREBLE on hikey/hikey960" am: 1ec2b08e98
am: aa3292d0a8

Change-Id: I4793ff80cd2cbcaf387873fa938e480571d7d006