Merge "gd/parser: Separate code requires block in yacc" am: 4e2b143e am:...

Merge "gd/parser: Separate code requires block in yacc" am: 4e2b143e am: 315a05e6 am: af87d17d am: 62b6421a

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1864825

Change-Id: I5f6f6cb7b8b88045d64e1ae5d948d5fab708612f