Pass more information to the attribute parsing functions.

Change-Id: I790dc54dd3de8a84758789d58f2ee17f175a6582
2 files changed