Diag on the A-Family mainline has fallen out of date. Create a commit to bring diag up to date. This includes the HSIC race condition fix while in MEMORY_DEVICE_MODE CRs-Fixed: 446711 Change-Id: Iceb2afb0bf6e52db45732b51b51777030df312ac Signed-off-by: Dixon Peterson <dixonp@codeaurora.org>