Merge "Convert hostsidetests/appsecurity/test-apps/**/Android.mk files to Android.bp" am: 6bc4cd23b0 am: 47eb6693da am: 2e0d61566a
am: d3bf8ed582

Change-Id: I52528657b35e9bbef3975043e76297f280ebb48e