Merge "Remove libandroid dependencies from some targets"