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

Change-Id: I72d1cd7801b7076c055e49678a48a267d9fe15d4