Modified naming for Play Store compatibility. Now not needed to overwrite the build id.
Header changes for Display-caf matching with cmtestkernel