Merge "Fix memory leak warning in FwdLockEngine.cpp"
am: 809ea9d9cc

Change-Id: Id83653de65130ab3f73a720d9196d5ae47ec9613