Update makefiles for vndk enabled. am: 5e59402492 am: 271d53d836 am: 148ca84740
am: 65de66a67e  -s ours

Change-Id: I0a2e62f878eb588c3d35825fc57ac5b4acd608fd