Merge \\"Turn ndk link check warning into error\\" am: 32ebe53d01
am: 95d3b735b6

Change-Id: I700fa4e5b08149aad3539ae302e904af863e2519