am e9c4ed6d: am 926d2878: am 56bab444: Merge "AArch64: Fix GetChannelCount() declaration."

* commit 'e9c4ed6d352a3a1e74dbefe8e3f51e255d62b148':