Merge "Docs: Define user builds and isolated client mode, add SIM # and AAPT"