merge from tag exdroid4.0.4r1-a10-v1.5release