pick up some packages from cm

Change-Id: I8213bb9e7c735a94075acb8feaf067bb590ee0a1