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

Change-Id: I25fed6576441cbd329bb0228ff47c625172c8444