Merge "Don't ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used."