changed external_skia to merged Butter/AOKP branch