Merge "Export asm-6.0 as device modules" am: ac4db5fb60 am: 474ab2b8bb
am: 7c63341e03

Change-Id: Ia0c09f6f192b1f576b78405074e04a1faeab2f3c