Bump version to 3.0 and fix AICP version separation

PS2: distinuish maintainer version

Change-Id: If5f52b78fbce67bea6ee855ced6414ae1d0ddfa2