Merge "init/builtins.cpp: Switch to finit_module am: f2049163a4 am: f6ff9638b2" into nyc-mr1-dev-plus-aosp