Update Manifest and Build Script

Change-Id: Id6a7daf3cd9ab08cfa6d832550a3fcfdbf2a1052