Merge "Add is_inlined and is_pure property to header-abi-dump" am: 54e9654768
am: 088bdf1af4

Change-Id: I240185633d66bc5768650be653f08fd725a1a26e