Merge "Move selinux policy build decisions to sepolicy Makefile" am: 784c851785 am: b19825012e
am: cf4fdc1c6a

Change-Id: I1348e7629cb9708df99dd3a0e867d168331f08db