Streamline code.

Change-Id: Id6792748eb36cf91aec2af5ea9aadcfe634510f3
dedupe: Remove the comment line, adjust freecon.

Change-Id: I89229e7c4de7788467a248c0e93ef126de7b35ed
Nandroid: support selinux context inside tar archive

Change-Id: I38e2a194235e6b10d6ae040b6c93497136528186