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

Change-Id: Ic15c329acce39be05fa336f3a852f527b380beb4