Merge commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b' into eclair-mr2-plus-aosp * commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b': Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.
Merge commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b' into eclair-mr2-plus-aosp * commit 'd8729c597b9fe8cbdbf145bea0dbaec4f075015b': Removing an unused header file and a stale forward declaration. Also handling one more nalType as a no-op.