Merge "Header comparison tool for Bionic vs NDK platforms"