huashan: Unify with blue-common kernel

One big happy family! <3 *hugs* <3

Change-Id: Ib9a50bc1ba2cde97a633615520ff552edbab83ac