Merge "Don\'t ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used."
am: 0e0e95e592

* commit '0e0e95e592d3538dc2e816e6d5291231b0cd47c7':
  Don't ignore LOCAL_INIT_RC if LOCAL_INIT_RC_32/64 is used.