fork build for unified device commits

Change-Id: I1b10e2364ad514545831a3fd6e472f235172153a
Signed-off-by: cj360 <ayunker551@gmail.com>