am dfd31ee8: Merge change 24034 into eclair

Merge commit 'dfd31ee89975a3307c088f7a69a63b93381e2758' into eclair-plus-aosp

* commit 'dfd31ee89975a3307c088f7a69a63b93381e2758':
  Improve error message for unknown struct members