Merge "Remove libdexfiled.so from public libraries for golem." am: 2b7e1c6d04
am: e61d4251ea

Change-Id: If548585f83b69cf9995439fcc957cff89338ff16