am f6cf387e: Merge "Recursively resolve @string/resource reference in key key spec parsing"

* commit 'f6cf387edc5e70dd578790c2625c50ed00a5dbf0':
  Recursively resolve @string/resource reference in key key spec parsing