Merge "init/selinux: renames nonplat_declaration.cil to plat_pub_versioned.cil" am: d06a0c035b am: 43da9ee604
am: 3da0a4f61e

Change-Id: I933300fce0048a3f1b7db262528e1df977806286