am 96a228bd: Merge "Remove mention of layoutopt/uix as they are gone."

* commit '96a228bd7904b83274575522a267d178b3da2341':
  Remove mention of layoutopt/uix as they are gone.