track jb2-armv6 branches

Change-Id: I0e07ef3d7186b6f44d533a7779bf9be363ff69b0