Merge "Remove "is_inlined" from header-abi-dumper" am: 752ffe8a3b
am: d50a355be6

Change-Id: I6a15c35d54d0c351d2f071e644ccffd6d2ec9ec7