Misc preparations for ArchiDroid app