Merge "Camera: Change targetSDK to kitkat from JB."