Merge "Avoid converting rslib.bc to things like rslib.h. So we are less error-prone." into honeycomb