[roll] Roll 1 change from upstream d7eebbfb..dde6dc83

[dde6dc83] [build] Clean up no_rtti config handling

Change-Id: I9438f654fba109b70a29b1982443e45081f595ca