Merge "Code clean for libcameraservice"