Fix NdkImage.h includes
am: 2ea0d46034

Change-Id: Iee049a63b22f7dbe8df329db6d1f9027570057b8