am 979d5c9b: am dc3e2607: Force sooner/generic/sim to use camera stub only.
am 979d5c9b: am dc3e2607: Force sooner/generic/sim to use camera stub only.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base