am 0ef3c2c1: Merge "Get struct names only for non-literal structs"

* commit '0ef3c2c1f34aa61541c0b67833821eb0adfdf198':
  Get struct names only for non-literal structs