Fix for hadoop1 build.

Also updated Security.avdl to be more evolvable.

Reviewed by: ajprax (over the shoulder)