Fix build errors
Merge branch 'blk' of https://github.com/BLK-ROM/android_frameworks_base into HEAD
Merge branches 'blk_alpha3' and 'blk' into blk