Revert latest SnapdragonCamera Promotion

reverts commit db126f27692565bba5f45f0523df6449e1654ba2.
reverts commit 85076fda04296ed1ba8f41bf1f5bdb4e56716749.

Change-Id: Idc8dffc562d09a3e6369121465e1c8cd352d9979
8 files changed