Merge "Build core.current.stubs without framework libraries"
am: f28db40ccc

Change-Id: I2609339aa28f4c6f5f7862590089a3c6a138f321