Merge "Move default libnativehelper include to mock dir." am: cfdbad8210 am: 0b6891cc21
am: 8f559c1cbd

Change-Id: Icadd0e098c8c8c52772cf86506d96f1535c2a7e9