Includes bitmap.h which was missing from v9 but was previously in v8. Also includes new obb stuff and other things that have gotten out of sync. Change-Id: I6cf9ccdbc9d3271a34a1cf8a1de78aa8a1757276
