98d57c95bc
For generic, continue to use the C version of the code. Bug: 13746695 (cherry picked from commit 7d849ac378515efa1522e538e6e1d3b546cae97d) Change-Id: Iae44785f37f9bb59103ab78fb9f74c92f8a95c7f