Merge "Disable dtor inlining for clang-tidy"
am: e51fcf01bd

Change-Id: I2a146a0ee711f29a3896ed8b8ce18a5a04b15043