Merge "Add support for *_CPU_VARIANT_RUNTIME flags"
am: 4208c81ab9

Change-Id: I6db4e1b734fe50bc09688b83b2cb6977cca53c37