fix build errors on aokp (jb-branch)