change paths and versions to aozp

also added cLock to extra optional packages in an attempt to build it with rom