fix framework errors (replaced by AOSP)