shieldtablet: Update from rel-st8-r2.5

Change-Id: Ia88ce801465225ce739d3891d9bc8f156e630704