Changes to support custom CM build
Update custom apps and proprietary files

Change-Id: I9f209f4e77d20db354e5554e02f8de452effea5a