Merge "Enable libnativehelper for Windows" am: 95568a01bf am: 59b31fdf97
am: bbb5d6d4a0

Change-Id: Ib66b6d22c1fbb6c491ca16c942cfa8c52fb6f878