Revert to Linaro-4.7 for now

Change-Id: I1d78acdc6bf33618f86aa435f0c130ef72932af0