Merge "Remove unused /selinux_version" am: f32107fbb2
am: ac5ac23bb3

Change-Id: I8d134c0e0829876adea15ab43a5d798cc9533a1d