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