Merge "Switch from no_standard_libs:true to sdk_version:"none"" am: c581ff5e7d
am: c661f9e765

Change-Id: I9859327649e0a597d902e944e8749fbbada411d6