960-default-smali64 is failing. This reverts commit 2b615ba2. Change-Id: Iebb8ee5a917fa84c5f01660ce432798524d078ef