Merge commit '8ea71511c64e61fe23004889ff7032f991a751c8' into gingerbread-plus-aosp * commit '8ea71511c64e61fe23004889ff7032f991a751c8': Initial tool for OBB manipulation
Merge commit '8ea71511c64e61fe23004889ff7032f991a751c8' into gingerbread-plus-aosp * commit '8ea71511c64e61fe23004889ff7032f991a751c8': Initial tool for OBB manipulation