Merge "Add BitmapTableBuilder."
am: 2f821578c3

Change-Id: I25b4b0bd834490c303cb5d283ecc69c19cfa3589