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

Change-Id: I8ae2813ccf944ffd0fecaff229df72f05cbeead6