Merge "Convert tests/tests/selinux/**/Android.mk files to Android.bp" am: c16b482c7a
am: 657fb193d2

Change-Id: Ia54c3ee92eba47100abcfaf54f80bc7308919189