Fixed compilation issues for M upgrade Change-Id: I602aa7c8a2db9682a1fe94b7ca892027281deec7
This change makes modifications to existing utilities and adds a couple of new utilites to help with the launcher Change-Id: Ib65ffe8e60c7e4a824c5c362765df5dcba872424 CRs-fixed: 600179