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

Change-Id: I101c57de5ce93c02b919edfc2731f3818008e0fb