Final changes for compiling a stable pac-man rom for htc bravo

Change-Id: I1e9ac8f2597925e2a8746cd85cb73e8e218aa92b