Update Android build tools version
Fix top-level Views bug in Activity