Switch over to my forks for htc bravo

Change-Id: I8744686c56fef1ce60216f91eeee9a9733fb2d24