Rebuild with Android guidelines