JustArchi's ArchiDroid Optimizations V2 --> V3

Change-Id: I73242c27a43d75271fbee4baa758519eb95298a6