Merge "Add support for only a .eh_frame." am: 58fb262613
am: fa9d130401

Change-Id: Ie2706499c372b013853043d06fe6f3933692988c