Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread