Merge "Rename "Makefile" to "Android.mk" throughout the tree."