Merge branch 'stable-3.1' * stable-3.1: Remove standalone build mode Change-Id: I3e6edf20633534d988ff667ca6d46ad341bc9ec2