Merge "SEEMP: port sepolicy changes to Android O"