Merge "Use modified android_dlwarning" into nyc-dev