This reverts commit 152d2d4234. Fixed build error, and also fixed memory leak spotted from warning. Bug: 17691572 Change-Id: I23b5ba537f7b557432041d4338b38b9be434e981
152d2d4234