Merge "DO NOT MERGE: Almost all warnings are now errors in RS build." into honeycomb-mr1