Merge "More NDK generated libs support." am: bd9fb4ba01
am: db4c597d5f

Change-Id: Icaef258ae8c69609845a2347d6963d09275a1a45