Merge "Fix build rules for statically linked oatdump on host."
am: 71601907b9

Change-Id: Ie2ce7d6a6d8cd8da033da76e97657ab81ba12411