Fix for JustArchi's ArchiDroid Optimizations

Change-Id: I43a2c4ee0c2143eb93837611d872bcfd552519e2