Merge "QCamera2: Return Error when deferred allocation fails"