Merge "libcameraservice: Provide flag for overriding camera output to portrait."