Merge "Update NDK's android headers"