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

Change-Id: If61db9476ad8dd395cdf042043f7488471c7932b