Merge "Add new cpu variant related rules to SELinux" am: e80631ff53
am: ea04f8de6a

Change-Id: Ia93e125f43535ecf9f8769a13656ad6685e684c9