Fix merged bitmap mesh generation and reenable merging

bug:26793764
bug:26569206
Change-Id: I54628e99b61f58f5726a387ea3599c29695c0efc
3 files changed