Aroma : Fix skip of needed settings when keeping settings.
Buildscript : Zip optimized Dalvik/bionic with everything else.