Merge branch 'timob-12970' into timob-7401
Support Ti.Media.switchCamera. TIMOB-7401
timob-14540: handle OutOfMemoryError gracefully
timob-14349: Implementing setCacheMode for web view
timob-14540: handle OutOfMemoryError gracefully
timob-14317: first implementation of threshold
TIMOB-9991-added a new Android property to disable lightTouchEnabled
timob-14317: change event to 'marker'
TIMOB-13046 remove remote  flag check
Merge remote-tracking branch 'origin/master' into timob-7401

Conflicts:
	android/modules/media/src/java/ti/modules/titanium/media/MediaModule.java
	android/modules/media/src/java/ti/modules/titanium/media/TiCameraActivity.java
[TIDOC-1195] Update default value
Document Ti.Media.switchCamera

TIMOB-7401
Merge remote-tracking branch 'upstream/master' into timob-7401
TIMOB-9991-Took care of the review comments in docs
[TIDOC-1129] Fix URLs
Add Android-specific note to switchCamera doc.

TIMOB-7401
Merge remote-tracking branch 'upstream/master' into timob-7401
Merge pull request #4570 from bhatfield/tidoc-1129b

[TIDOC-1229] Fix URLs
Merge pull request #4562 from bhatfield/tidoc-1195

[TIDOC-1195] Update default value
Merge pull request #4520 from salachi/TIMOB-9991-WebViewLink

TIMOB-9991-added a new Android property to disable lightTouchEnabled