CM bionic/dalvik/skia

Change-Id: Ie66f72adb1166bd7850226f8e9603e4ab08052a0