Merge "MIPS64: Extend instruction_set_features_mips64_test" am: ae7eef6ee1
am: 4172552060

Change-Id: I4568b6e0541102b6a01128134d7527c4e5037d97