JustArchi's ArchiDroid Optimizations V3

Change-Id: Ife98f13869e29d09b7fae56e30da2c743a95a99d