Revert "HACK: Workaround hikey64_only target not building with FULL_TREBLE" am: 1e2c80bd71
am: 10f0bc13db

Change-Id: I7bf4f8bf567164d098671b6636eb8e8a7eb7508f