Merge "Reorganized rootcomponentgenerator package and added demo." am: 1ab138ae73
am: 295e807a06

Change-Id: I0d2580605860c92c9fe1e7161b7623cec6bdb24b