shieldtablet: Update from rel-st8-r2.5

Change-Id: Iec13d787baf6f6fdeb7ce3f83dfde178ca254cfa