Merge "Convert hostsidetests/securitybulletin/**/Android.mk files to Android.bp" am: 01f288672f
am: 6283741fd2

Change-Id: Ia6936a82d0251ae1e7aae6bb6e2d576e58807e9a