Return to Xperia Z2 dalvik and bionic

Change-Id: I97fdb77f06718c6a29d652afce1aa407cf56e746