Update manifest and build script

Change-Id: I672d848727f3b0919fd48c6c196fe86df6ed7230