Merge "New orientation handling.  Only impacts SDK (aapt dump badging)." into honeycomb-mr2