Merge "Refactor allocation entrypoints." into dalvik-dev