resolve merge conflicts of 91d398d8 to stage-aosp-master

Android.mk

prebuilts/api/26.0/nonplat_sepolicy.cil

prebuilts/api/26.0/private/access_vectors

prebuilts/api/26.0/private/adbd.te

prebuilts/api/26.0/private/app.te

prebuilts/api/26.0/private/app_neverallows.te

prebuilts/api/26.0/private/asan_extract.te

prebuilts/api/26.0/private/atrace.te

prebuilts/api/26.0/private/attributes

prebuilts/api/26.0/private/audioserver.te

prebuilts/api/26.0/private/binder_in_vendor_violators.te

prebuilts/api/26.0/private/binderservicedomain.te

prebuilts/api/26.0/private/blkid.te

prebuilts/api/26.0/private/blkid_untrusted.te

prebuilts/api/26.0/private/bluetooth.te

prebuilts/api/26.0/private/bluetoothdomain.te

prebuilts/api/26.0/private/bootanim.te

prebuilts/api/26.0/private/bootstat.te

prebuilts/api/26.0/private/bufferhubd.te

prebuilts/api/26.0/private/cameraserver.te