Merge "Add a folder for Aconfig demo"