Merge "Revert "Add android.hardware.neuralnetworks@1.3"" am: eccca6c246 am: b393327ccb
am: 99f0abb4d9

Change-Id: I74ae7484291e1c1c4da09d6d1ed5bdf6fed46d4c