fixed layout as proposed by ADT
fix typo
reflect updated libraries in buildtools