Merge "remove dependency on android_native{s_priv|buffer}.h"