Merge "Remove the need to find Android.mk files via directory symlinks"