Update Android Architecture