Merge "Add empty.mk"