Merge "init/builtins.cpp: Switch to finit_module"
am: b3cf2e0

* commit 'b3cf2e0f3d3b9ba328921cd1c9c3839ea70a1ab1':
  init/builtins.cpp: Switch to finit_module

Change-Id: I23d53bb70856016968c58a417b9299be572392a7