updated support library to v18, merged facebook/master