Merge "BoostFramework: Clean up code" into p-keystone-qcom