Merge "Add BitmapTableBuilder." am: 2f821578c3
am: 3f13666090

Change-Id: Ica0d0f4d5a94c3f0e71d8d864f44bbd98f144c77