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

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

Change-Id: Ia1665193f8e0e5d11dbdda70b6b8b48119d60358