[TIMOB-10678] rename _updateTitleBar => updateNavBar
rename _refreshBackButton => refreshBackButton
[TIMOB-10854] ios-sim uses default Xcode.app location ignoring location specified by xcode-select
[TIMOB-10819] iOS: building a project fails trying to target iOS 6 due to dropped armv6 support
Merge pull request #2931 from mstepanov/timob-10819-21x

(2_1_X)[TIMOB-10819] iOS: building a project fails trying to target iOS 6 due to dropped armv6 support
Merge pull request #2925 from mstepanov/timob-10854-21x

(2_1_X)[TIMOB-10854] ios-sim uses default Xcode.app location ignoring location specified by xcode-select
Merge pull request #2916 from mstepanov/timob-10678-21x

(2_1_X)[TIMOB-10678] iOS: Rename non-public APIs
TIMOB-10696 TIMOB-10693 Simpler fix for TIMOB-10810

Conflicts:

	iphone/Classes/TiUILabel.m
timob-10832: picker regression
Merge pull request #2947 from hieupham007/timob-10832

timob-10812 (2.1.X): picker regression
TIMOB-10125: Android: Window properties:Background image is not setting up after height/width toggling.
Added new iPhone 5 default image. Fixes TIMOB-10885.
Merge pull request #2957 from ayeung/timob-10125-2_1_X

TIMOB-10125: Android: Window properties:Background image is not setting ...
Merge pull request #2958 from ingo/2_1_X

Added new iPhone 5 default image. Fixes TIMOB-10885.
Add "screenSize" to the list of "configChanges" that our Activities handle.  This is necessary because beginning in api level 13 (Honeycomb MR2, Android 3.2), screenSize is not handled automatically by Android if the targetSdkVersion is set to 13 or higher.  The consequence of this is that if you change the orientation of the device (e.g., portrait->landscape), the activity will restart (unless you indicate in AndroidManifest.xml that your activity handles screenSize).  Since we do not support system restarts of activities, in Titanium this leads to the entire app shutting down and restarting.

By adding screenSize to the list of configChanges in our template AndroidManifest.xml, we can prevent the application re-start.

However, since the addition of screenSize will cause aapt to fail when building against versions of Android that are older than api level 13, we now also automatically build against the latest version found in the user's Android SDK folder.  And if we do not find a version that is at least 13, we remove screenSize from the generated AndroidManifest.xml so as to allow aapt to finish successfully.

[TIMOB-10863]
When targetSdkVersion is set in tiapp.xml's <android><manifest> section, build apps against that version (or the next best previous version available in the user's Android SDK folder.)

If the resulting SDK version is Honeycomb MR2 (3.2, api level 13) or higher, add "screenSize" to the list of "configChanges" that our Activities handle.  This is necessary because when targeting api level 13 or higher, a change in device orientation causes a screenSize config change that is not automatically handled by Android and thus causes the activity to restart unless "configChanges" contains an entry for screenSize.

[TIMOB-10863]

Conflicts:

	support/android/builder.py
TIMOB-10860: Android: ScrollView not scrolling anymore with horizontal layout
[TIMOB-9904]Do not use constrained size with sizeToFit
[TIMOB-10501] add sourceURL:startingLineNo to KrollEval for better error reporting
TIMOB-9469: Added a border wrapper view to handle borderWidth, borderRadius, and borderColor correctly.