Adding lib1 as well as aar1.
Changed aar1 package name to better reflect it as sibling of apklibs.
Changed apklib artifact names to make it clear that they are apklibs.