Merge "Move support library to a separate static library"