Update manifest and build script

Change-Id: I605653b3e4d8305f7bec8e1ab4eb37b52e47c007